Author: eliot Date: 2011-07-29 16:48:34 -0700 (Fri, 29 Jul 2011) New Revision: 2477
Added: branches/Cog/nscogbuild/macbuild/installer/ branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in branches/Cog/nscogbuild/macbuild/installer/Makefile branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/macbuild/installer/branding.gmk branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk branches/Cog/nscogbuild/unixbuild/bld/mvm branches/Cog/platforms/unix/config/Makefile.in branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/scripts/mkvmarchives branches/Cog/unixbuild/bld/mvm branches/Cog/unixbuild/mtbld/mvm Log: Install/build chicanery. Add a Newspeak Mac OS installer. Make the Windows installer version the resulting .msi. Change the unix build to use 4.0-SVNREV as the VM version. make the unix mvm build scripts configure if their builds have not yet been configured, and use absolutized relative paths for the prefix.
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -13,7 +13,7 @@ WIN_SDK := /cygdrive/c/Program\ Files/Microsoft\ SDKs/Windows/$(WIN_SDK_VER)/ MSIVAL2_DIR := /cygdrive/c/Program\ Files/MsiVal2/
-MSI_NAME := $(INSTALLER_BASE_NAME).msi +MSI_NAME := $(INSTALLER_BASE_NAME)-$(VERSION).msi .DEFAULT_GOAL := $(MSI_NAME) all: $(MSI_NAME)
Added: branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png =================================================================== (Binary files differ)
Property changes on: branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream
Added: branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,22 @@ +tell application "Finder" + tell disk "@@VM_LOCALIZED_NAME@@" + open + set backgroundImage to file ".background:@@INSTALLER_BACKGROUND@@.png" + tell container window + set current view to icon view + set toolbar visible to false + set statusbar visible to false + set position to {100, 100} + set bounds to {100, 100, 597, 485} + end tell + tell icon view options of container window + set arrangement to not arranged + set icon size to 128 + set background picture to backgroundImage + end tell + set position of item "Applications" to {370, 91} + set position of item "@@VM_LOCALIZED_NAME@@.app" to {130, 91} + set position of item "@@SOURCEFILENAME1@@" to {130, 266} + eject + end tell +end tell
Added: branches/Cog/nscogbuild/macbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/Makefile (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,28 @@ +# Makefile for the Mac OS installer. +# Produces a .dmg given an executable, and possibly an image file. +# +# How to build: +# edit and run ./links to get .app and sources, then run make + +SOURCES := yes +DOCUMENTATION_DIR := doc + +include branding.gmk +include branding-sed-rules.gmk + +space:= $(empty) $(empty) +define ESCAPE_VAR +$(1)_ESC := $(subst $(space),$(space),$($(1))) +endef +BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE +$(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var)))) + +$(VM_LOCALIZED_NAME_ESC).app: + rm -rf $(VM_LOCALIZED_NAME_ESC).app + cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app + +# Cab contents: +VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app +SOURCEFILENAME1 := SqueakV41.sources + +include installer-Darwin.gmk
Added: branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns =================================================================== (Binary files differ)
Property changes on: branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream
Added: branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,11 @@ +SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' +SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' +SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;' +SED_RULES += -e 's%@@VM_LOCALIZED_NAME@@%$(VM_LOCALIZED_NAME)%g;' +SED_RULES += -e 's%@@MANUFACTURER@@%$(MANUFACTURER)%g;' +SED_RULES += -e 's%@@PRODUCT_NAME@@%$(PRODUCT_NAME)%g;' +SED_RULES += -e 's%@@PRODUCT_VERSION@@%$(PRODUCT_VERSION)%g;' +SED_RULES += -e 's%@@IMAGE@@%$(IMAGE)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME1@@%$(SOURCEFILENAME1)%g;' +SED_RULES += -e 's%@@INSTALLER_BACKGROUND@@%$(INSTALLER_BACKGROUND)%g;' +SED_RULES += -e 's/^#.*//;'
Added: branches/Cog/nscogbuild/macbuild/installer/branding.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/branding.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/branding.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,35 @@ +# Version should follow the Windows convention (0-255.0-255.0-65535) +# For the prototype, use YY.MM.DDNN (NN should come from the image +# name, e.g., nsboot-20YY-MM-DD.NN.image) +#VERSION := 07.11.0101 + +# Base name of the executable (.exe is appended on Windows) +ifndef VM_BASE_NAME +VM_BASE_NAME := nsvm +endif + +# Product name as compiled into the executable and installers +ifndef PRODUCT_NAME +PRODUCT_NAME := Newspeak Virtual Machine +endif + +# Used for Desktop/menubar shortcuts +ifndef VM_LOCALIZED_NAME +VM_LOCALIZED_NAME := $(PRODUCT_NAME) +endif + +ifndef MANUFACTURER +MANUFACTURER := Cadence Design Systems, Inc. +endif + +ifndef PROJECT_REVERSE_DOMAIN +PROJECT_REVERSE_DOMAIN := org.newspeakplatform +endif + +ifndef INSTALLER_BACKGROUND +INSTALLER_BACKGROUND := InstallerBackground +endif + +ifndef INSTALLER_ICON +INSTALLER_ICON := VolumeIcon +endif
Added: branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,26 @@ +VM_DMG := $(VM_LOCALIZED_NAME_ESC).dmg + +$(VM_DMG): $(VM_BUNDLE) $(INSTALLER_BACKGROUND).png LayoutDiskImage.applescript $(INSTALLER_ICON).icns + -hdiutil eject '/Volumes/$(PRODUCT_NAME)' + -rm -f "$@.sparseimage" "$@" + hdiutil create -size 100m -type SPARSE -volname $(VM_LOCALIZED_NAME_ESC) -fs 'Journaled HFS+' "$@.sparseimage" + hdiutil attach "$@.sparseimage" + mkdir -p '/Volumes/$(PRODUCT_NAME)/.background' + cp -p '$(INSTALLER_BACKGROUND).png' '/Volumes/$(PRODUCT_NAME)/.background' + ln -s /Applications '/Volumes/$(PRODUCT_NAME)/.' + ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app' + ditto $(SOURCEFILENAME1) '/Volumes/$(PRODUCT_NAME)/$(SOURCEFILENAME1)' + 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)' + 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) + +.DEFAULT_GOAL := $(VM_DMG) + +LayoutDiskImage.applescript: LayoutDiskImage.applescript.in branding.gmk branding-sed-rules.gmk Makefile + sed $(SED_RULES) < $< > $@ + +clean:: + -rm -rf $(VM_DMG) $(VM_DMG).sparseimage LayoutDiskImage.applescript *.app
Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../../scripts/nukeversion;make install prefix=~/oscogvm/nsvmlinux +test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid" +../../../scripts/nukeversion +rm -rf ../../../nsvmlinux +make install prefix=`readlink -f `pwd`/../../../nsvmlinux`
Modified: branches/Cog/platforms/unix/config/Makefile.in =================================================================== --- branches/Cog/platforms/unix/config/Makefile.in 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/Makefile.in 2011-07-29 23:48:34 UTC (rev 2477) @@ -63,7 +63,7 @@ # nuke everything but plugins.int & plugins.ext
reallyclean: - for f in *; do case "$$f" in plugins.[ie][nx]t) ;; *) rm -rf $$f; esac; done + for f in *; do case "$$f" in plugins.[ie][nx]t|mvm) ;; *) rm -rf $$f; esac; done
# npsqueak
Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/configure 2011-07-29 23:48:34 UTC (rev 2477) @@ -1510,13 +1510,15 @@
+SVNREV=`grep '$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/.*$Rev: ([0-9][0-9]*).*/\1/'`
- VM_MAJOR=3 - VM_MINOR=9 - VM_RELEASE=7 - SQ_MAJOR=3 - SQ_MINOR=9a - SQ_UPDATE=7024 + VM_MAJOR=4 + VM_MINOR=0 + VM_RELEASE=${SVNREV} + SQ_MAJOR=4 + SQ_MINOR=2 + SQ_UPDATE=0
topdir=`cd ${srcdir}/../../..; pwd` @@ -5874,7 +5876,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5877 "configure"' > conftest.$ac_ext + echo '#line 5879 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6891,7 +6893,7 @@
# Provide some information about the compiler. -echo "$as_me:6894:" \ +echo "$as_me:6896:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: "$ac_compiler --version </dev/null >&5"") >&5 @@ -7954,11 +7956,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:7957: $lt_compile"" >&5) + (eval echo ""$as_me:7959: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7961: $? = $ac_status" >&5 + echo "$as_me:7963: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8222,11 +8224,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:8225: $lt_compile"" >&5) + (eval echo ""$as_me:8227: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8229: $? = $ac_status" >&5 + echo "$as_me:8231: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8326,11 +8328,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:8329: $lt_compile"" >&5) + (eval echo ""$as_me:8331: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8333: $? = $ac_status" >&5 + echo "$as_me:8335: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9795,7 +9797,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9798 "configure"' > conftest.$ac_ext + echo '#line 9800 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10692,7 +10694,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10695 "configure" +#line 10697 "configure" #include "confdefs.h"
#if HAVE_DLFCN_H @@ -10792,7 +10794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10795 "configure" +#line 10797 "configure" #include "confdefs.h"
#if HAVE_DLFCN_H @@ -13135,11 +13137,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:13138: $lt_compile"" >&5) + (eval echo ""$as_me:13140: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13142: $? = $ac_status" >&5 + echo "$as_me:13144: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13239,11 +13241,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:13242: $lt_compile"" >&5) + (eval echo ""$as_me:13244: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13246: $? = $ac_status" >&5 + echo "$as_me:13248: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13775,7 +13777,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 13778 "configure"' > conftest.$ac_ext + echo '#line 13780 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14833,11 +14835,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:14836: $lt_compile"" >&5) + (eval echo ""$as_me:14838: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14840: $? = $ac_status" >&5 + echo "$as_me:14842: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14937,11 +14939,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:14940: $lt_compile"" >&5) + (eval echo ""$as_me:14942: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14944: $? = $ac_status" >&5 + echo "$as_me:14946: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16386,7 +16388,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16389 "configure"' > conftest.$ac_ext + echo '#line 16391 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17164,11 +17166,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:17167: $lt_compile"" >&5) + (eval echo ""$as_me:17169: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17171: $? = $ac_status" >&5 + echo "$as_me:17173: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17432,11 +17434,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:17435: $lt_compile"" >&5) + (eval echo ""$as_me:17437: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17439: $? = $ac_status" >&5 + echo "$as_me:17441: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17536,11 +17538,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:17539: $lt_compile"" >&5) + (eval echo ""$as_me:17541: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17543: $? = $ac_status" >&5 + echo "$as_me:17545: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19005,7 +19007,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 19008 "configure"' > conftest.$ac_ext + echo '#line 19010 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$?
Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/configure.ac 2011-07-29 23:48:34 UTC (rev 2477) @@ -32,7 +32,9 @@
AC_INIT([config.h.in])
-AC_VM_VERSION(3,9,7, 3,9a,7024) +SVNREV=`grep '$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/.*$Rev: ([[0-9]][[0-9]]*).*/\1/'` +AC_VM_VERSION(4,0,${SVNREV},4,2,0)
topdir=`cd ${srcdir}/../../..; pwd` cfgdir=`cd ${srcdir}; pwd`
Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/scripts/mkvmarchives 2011-07-29 23:48:34 UTC (rev 2477) @@ -50,12 +50,12 @@ if [ -n "$CL" ]; then rm -rf coglinux.tgz COPYFILE_DISABLE=1 tar czf coglinux.tgz coglinux - EXES="$EXES coglinux/lib/squeak/3.9-7/squeak" + EXES="$EXES coglinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$CTL" ]; then rm -rf cogmtlinux.tgz COPYFILE_DISABLE=1 tar czf cogmtlinux.tgz cogmtlinux - EXES="$EXES cogmtlinux/lib/squeak/3.9-7/squeak" + EXES="$EXES cogmtlinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$CM" ]; then test -d Cog.app || mkdir Cog.app @@ -92,7 +92,7 @@ if [ -n "$NL" ]; then rm -rf nsvmlinux.tgz COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux - EXES="$EXES nsvmlinux/lib/squeak/3.9-7/squeak" + EXES="$EXES nsvmlinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$NM" ]; then test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app
Modified: branches/Cog/unixbuild/bld/mvm =================================================================== --- branches/Cog/unixbuild/bld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/unixbuild/bld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../scripts/nukeversion;make install prefix=~/oscogvm/coglinux +test -f config.h || ../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread +../../scripts/nukeversion +rm -rf ../../coglinux +make install prefix=`readlink -f `pwd`/../../coglinux`
Modified: branches/Cog/unixbuild/mtbld/mvm =================================================================== --- branches/Cog/unixbuild/mtbld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/unixbuild/mtbld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../scripts/nukeversion;make install prefix=~/oscogvm/cogmtlinux +test -f config.h || ../../platforms/unix/config/configure INTERP=cointerpmt --without-vm-display-fbdev --without-npsqueak CFLAGS="-g -O2 -msse2 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1" LIBS=-lpthread +../../scripts/nukeversion +rm -rf ../../cogmtlinux +make install prefix=`readlink -f `pwd`/../../cogmtlinux`