[Vm-dev] [commit][3597] Fix various build problems.
commits at squeakvm.org
commits at squeakvm.org
Sun Feb 14 17:22:08 UTC 2016
Revision: 3597
Author: eliot
Date: 2016-02-14 09:22:06 -0800 (Sun, 14 Feb 2016)
Log Message:
-----------
Fix various build problems. The Newspeak installers need to install
SqueakV50.sources and use CocoaFast.app. svn:ignore propertirs are missing
in build.linux32ARM. Nice to build the Pharo VMs as part of makeproduct.
Windows Makefiles need to put dll ancilliaries in the build dir and need to
nuke the .lib files after linking both VM exes.
Modified Paths:
--------------
branches/Cog/build.macos32x86/makeproduct
branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile
branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk
branches/Cog/build.macos64x64/makeproduct
branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile
branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile
branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk
branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile
branches/Cog/build.macos64x64/squeak.cog.spur/Makefile
branches/Cog/build.macos64x64/squeak.sista.spur/Makefile
branches/Cog/build.macos64x64/squeak.stack.spur/Makefile
branches/Cog/build.win32x86/bochsx64/conf.COG.dbg
branches/Cog/build.win32x86/common/Makefile
branches/Cog/build.win32x86/common/Makefile.plugin
branches/Cog/build.win32x86/newspeak.cog.spur/installer/links
Property Changed:
----------------
branches/Cog/build.linux32ARM/newspeak.cog.spur/build/
branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/
branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/
branches/Cog/build.linux32ARM/newspeak.stack.spur/build/
branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/
branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/
branches/Cog/build.linux32ARM/squeak.cog.spur/build/
branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/
branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/
branches/Cog/build.linux32ARM/squeak.stack.spur/build/
branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/
branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/
branches/Cog/build.linux32ARM/squeak.stack.v3/build/
branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/
branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.macos32x86/makeproduct
===================================================================
--- branches/Cog/build.macos32x86/makeproduct 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos32x86/makeproduct 2016-02-14 17:22:06 UTC (rev 3597)
@@ -1,6 +1,6 @@
#!/bin/bash
trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur squeak.cog.spur squeak.cog.v3"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3"
for d in $PRODUCTDIRS; do
if test -d "$d"; then
(cd ./$d;./mvm -A)
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -18,10 +18,10 @@
BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE
$(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var))))
-$(VM_LOCALIZED_NAME_ESC).app: ../Fast.app
+$(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app
rm -rf $(VM_LOCALIZED_NAME_ESC).app
- cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app
- ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
+ cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app
+ test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
# Cab contents:
VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 17:22:06 UTC (rev 3597)
@@ -11,7 +11,7 @@
ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app'
bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)'
cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns'
- /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)'
+ /Applications/Xcode.app/Contents/Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)'
osascript LayoutDiskImage.applescript
while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done
hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG)
Modified: branches/Cog/build.macos64x64/makeproduct
===================================================================
--- branches/Cog/build.macos64x64/makeproduct 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/makeproduct 2016-02-14 17:22:06 UTC (rev 3597)
@@ -1,6 +1,6 @@
#!/bin/bash
trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur squeak.cog.spur"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur"
for d in $PRODUCTDIRS; do
if test -d "$d"; then
(cd ./$d;./mvm -A)
Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -3,6 +3,6 @@
# Do make init to allow make -n to function.
#
-VMSRCDIR:= ../../nsspursrc/vm
+VMSRCDIR:= ../../nsspur64src/vm
include ../common/Makefile.app.newspeak
Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile
===================================================================
--- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -5,7 +5,7 @@
# edit and run ./links to get .app and sources, then run make
SOURCES := yes
-SOURCEFILENAME1 := $(shell echo ~/Squeak/SqueakV41.sources)
+SOURCEFILENAME1 := ../../../sources/SqueakV50.sources
DOCUMENTATION_DIR := doc
include branding.gmk
@@ -18,10 +18,10 @@
BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE
$(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var))))
-$(VM_LOCALIZED_NAME_ESC).app: ../Fast.app
+$(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app
rm -rf $(VM_LOCALIZED_NAME_ESC).app
- cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app
- -ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
+ cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app
+ test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
# Cab contents:
VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app
Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk
===================================================================
--- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 17:22:06 UTC (rev 3597)
@@ -11,7 +11,7 @@
ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app'
bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)'
cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns'
- /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)'
+ /Applications/Xcode.app/Contents/Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)'
osascript LayoutDiskImage.applescript
while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done
hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG)
Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -3,6 +3,6 @@
# Do make init to allow make -n to function.
#
-VMSRCDIR:= ../../nsspurstacksrc/vm
+VMSRCDIR:= ../../nsspurstack64src/vm
include ../common/Makefile.app.newspeak
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -3,7 +3,7 @@
# Do make init to allow make -n to function.
#
-VMSRCDIR:= ../../spursrc/vm
+VMSRCDIR:= ../../spur64src/vm
SOURCEFILE:=SqueakV50.sources
# Now include the Makefile proper, which is common to all Mac OS builds.
Modified: branches/Cog/build.macos64x64/squeak.sista.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -3,7 +3,7 @@
# Do make init to allow make -n to function.
#
-VMSRCDIR:= ../../spursistasrc/vm
+VMSRCDIR:= ../../spursista64src/vm
SOURCEFILE:=SqueakV50.sources
APPPOST:=overwriteSqueakIcon
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -3,7 +3,7 @@
# Do make init to allow make -n to function.
#
-VMSRCDIR:= ../../spurstacksrc/vm
+VMSRCDIR:= ../../spurstack64src/vm
SOURCEFILE:=SqueakV50.sources
# Now include the Makefile proper, which is common to all Mac OS builds.
Modified: branches/Cog/build.win32x86/bochsx64/conf.COG.dbg
===================================================================
--- branches/Cog/build.win32x86/bochsx64/conf.COG.dbg 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.win32x86/bochsx64/conf.COG.dbg 2016-02-14 17:22:06 UTC (rev 3597)
@@ -10,7 +10,7 @@
set echo
CFLAGS="-m32 $CFLAGS"
-CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS"
+CFLAGS="-Dsetjmp=_setjmp $CFLAGS"
CFLAGS="-pipe -O0 $CFLAGS"
CFLAGS="-g3 $CFLAGS"
CPPFLAGS=""
Modified: branches/Cog/build.win32x86/common/Makefile
===================================================================
--- branches/Cog/build.win32x86/common/Makefile 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.win32x86/common/Makefile 2016-02-14 17:22:06 UTC (rev 3597)
@@ -195,7 +195,7 @@
#############################################################################
# Common build rules
#
-default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE)
+default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs
svnver:
echo $(RC) $(RCFLAGS)
@@ -241,6 +241,9 @@
cleanmtdbg:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg
+nukelibs:
+ rm $(LIBS)
+
print-settings:
@echo ---------------- Makefile settings ------------------
@echo CONFIGURATION=$(CONFIGURATION)
Modified: branches/Cog/build.win32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-14 17:22:06 UTC (rev 3597)
@@ -135,15 +135,15 @@
$(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
$(DLLTOOL) \
- --output-def $(LIBNAME).def \
- --output-exp $(LIBNAME).exp \
- --output-lib $(LIBNAME).lib \
+ --output-def $(OBJDIR)/$(LIBNAME).def \
+ --output-exp $(OBJDIR)/$(LIBNAME).exp \
+ --output-lib $(OBJDIR)/$(LIBNAME).lib \
$(DLLTOOLEXTRAS) \
$(LIBOBJ)
ifneq ($(LINK_WITH_GCC),)
gcc -shared \
-mno-cygwin \
- -def $(LIBNAME).def \
+ -def $(OBJDIR)/$(LIBNAME).def \
-o $(VMDIR)/$(LIBNAME).dll \
--entry _DllMain at 12 \
$(GCCLINKEXTRAS) \
@@ -151,22 +151,22 @@
else ifneq ($(LINK_WITH_GPP),)
g++ -shared \
-mno-cygwin \
- -def $(LIBNAME).def \
+ -def $(OBJDIR)/$(LIBNAME).def \
-o $(VMDIR)/$(LIBNAME).dll \
--entry _DllMain at 12 \
$(GPPLINKEXTRAS) \
$(LIBOBJ) $(EXTRALIBS)
else
$(DLLWRAP) -mwindows \
- -def $(LIBNAME).def \
+ -def $(OBJDIR)/$(LIBNAME).def \
-o $(VMDIR)/$(LIBNAME).dll \
--entry _DllMain at 12 \
$(DLLWRAPEXTRAS) \
- $(LIBNAME).exp \
+ $(OBJDIR)/$(LIBNAME).exp \
$(LIBOBJ) $(EXTRALIBS)
endif
$(OPTSTRIP) --strip-all $(VMDIR)/$(LIBNAME).dll
- -$(RM) $(LIBNAME).lib
+ -$(RM) $(OBJDIR)/$(LIBNAME).lib
#############################################################################
# Rules for automated builds
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/links
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/installer/links 2016-02-14 00:43:52 UTC (rev 3596)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/links 2016-02-14 17:22:06 UTC (rev 3597)
@@ -1,9 +1,9 @@
#!/bin/sh
if [ "$1" = rm -o "$1" = mk ]; then
- rm SqueakV41.sources
+ rm -f SqueakV50.sources
fi
if [ "$1" = mk ]; then
- ln ../../../sources/SqueakV41.sources .
+ ln ../../../sources/SqueakV50.sources .
fi
if [ \( "$1" != rm \) -a \( "$1" != mk \) ]; then
echo usage: $0 'mk|rm'
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Feb 13 16:41:12 PST 2016
+ Sun Feb 14 09:18:32 PST 2016
More information about the Vm-dev
mailing list