[Vm-dev] [commit][2978]
Make sure the win32 makefiles remove interpret bytecode profiling labels
where
commits at squeakvm.org
commits at squeakvm.org
Wed Jun 11 13:19:15 UTC 2014
Revision: 2978
Author: eliot
Date: 2014-06-11 06:19:12 -0700 (Wed, 11 Jun 2014)
Log Message:
-----------
Make sure the win32 makefiles remove interpret bytecode profiling labels where
appropriate (i.e. keep then only in the production stack VMs).
Fix the platforms paths in the stack makefiles. Eliminate spurious differences.
And nuke the generic mkvmarchives in favour of the three cog,sisita,spur ones.
Modified Paths:
--------------
branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin
branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
branches/Cog/build.win32x86/newspeak.cog.v3/Makefile.plugin
branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin
branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
branches/Cog/build.win32x86/newspeak.stack.v3/Makefile.plugin
branches/Cog/build.win32x86/squeak.cog.spur/Makefile
branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin
branches/Cog/build.win32x86/squeak.cog.v3/Makefile
branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin
branches/Cog/build.win32x86/squeak.stack.spur/Makefile
branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin
branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext
branches/Cog/build.win32x86/squeak.stack.v3/Makefile
branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin
branches/Cog/build.win32x86/squeak.stack.v3/plugins.ext
Removed Paths:
-------------
branches/Cog/scripts/mkvmarchives
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -127,7 +127,8 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+ -DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
@@ -145,7 +146,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -127,7 +127,8 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+ -DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
@@ -145,7 +146,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -128,7 +128,8 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+ -DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
@@ -146,7 +147,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -128,7 +128,8 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+ -DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
@@ -146,7 +147,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -150,7 +150,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -125,16 +125,16 @@
# VM config flags.
ifeq ("$(CONFIGURATION)","product")
OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops
-NDEBUG:=-DNDEBUG # Define NDEBUG for production to exclude asserts
+NDEBUG:=-DNDEBUG -D'VM_LABEL(foo) 0' # Define NDEBUG for production to exclude asserts
DEBUGVM=0
else ifeq ("$(CONFIGURATION)","assert")
OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer
DEBUGVM=0
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
else
OFLAGS:= -D_MT -march=pentium4
DEBUGVM=1
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
endif
ifeq ("$(THREADING)","multi")
@@ -170,7 +170,7 @@
#LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
#CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -113,18 +113,16 @@
else ifeq ("$(CONFIGURATION)","assert")
OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer
DEBUGVM=0
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+# Disable bytecode profiling labels in interpret for debugging
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
else
OFLAGS:= -D_MT -march=pentium4
DEBUGVM=1
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+# Disable bytecode profiling labels in interpret for debugging
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
endif
-ifeq ("$(THREADING)","multi")
-COGDEFS:=-DCOGMTVM=1 -DDEBUGVM=$(DEBUGVM)
-else
-COGDEFS:=-DCOGMTVM=0 -DDEBUGVM=$(DEBUGVM)
-endif
+COGDEFS:=-DDEBUGVM=$(DEBUGVM)
# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h)
WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501
@@ -134,7 +132,7 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DDEBUGVM=$(DEBUGVM) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
+DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
@@ -145,21 +143,18 @@
#
# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols
# The switch '-mwindows' gives us a GUI app instead of a console app.
+# Newer cygwins want --export-all-symbols in place of --export-dynamic.
#
LD:= gcc
LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-dynamic -L/usr/lib/mingw
CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-dynamic -L/usr/lib/mingw
+#LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
+#CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
-# Gnuifier settings
-#
-AWK:= gawk
-GNUIFY:= $(PLATDIR)/win32/misc/gnuify
-
-#############################################################################
# Tools to use
#
AR:= ar rc
@@ -176,7 +171,8 @@
# Note: RC compiles the .rc files into linkable .o files
#
RC:= windres
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32
+SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
@@ -188,6 +184,9 @@
#
default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE)
+svnver:
+ echo $(RC) $(RCFLAGS)
+
product:;
$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default
@@ -200,26 +199,17 @@
# Do make init to allow make -n to function.
init: $(OBJDIR) eitheror.exe mkNamedPrims.exe
-cleanall: clean cleanmt cleanast cleanmtast cleandbg cleanmtdbg
+cleanall: clean cleanast cleandbg
clean:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build
-cleanmt:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmt
-
cleanast:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast
-cleanmtast:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast
-
cleandbg:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg
-cleanmtdbg:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg
-
print-settings:
@echo ---------------- Makefile settings ------------------
@echo CONFIGURATION=$(CONFIGURATION)
@@ -228,6 +218,7 @@
@echo CFLAGS=$(CFLAGS)
@echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS)
@echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS)
+ @echo OBJDIR=$(OBJDIR)
@echo LIBS=$(LIBS)
@echo DLLS=$(DLLS)
@echo -----------------------------------------------------
@@ -240,6 +231,9 @@
eitheror.exe: $(WIN32UTILDIR)/eitheror.c
$(CC) -o $@ -O1 -mconsole -mno-cygwin $<
+mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c
+ $(CC) -o $@ -O1 -mconsole -mno-cygwin $<
+
mkNamedPrims.exe: $(WIN32UTILDIR)/mkNamedPrims.c
$(CC) -o $@ -mconsole -mno-cygwin $<
@@ -251,7 +245,7 @@
vm: $(VMEXE)
-$(VMEXE): $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ)
+$(VMEXE): $(OBJDIR) $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ)
$(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c
$(LD) $(LDFLAGS) -o $(VMEXE) \
$(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ)
@@ -292,7 +286,6 @@
#############################################################################
# Building plugins
#
-
.PHONY: FORCE
# Internal plugin. Build as lib then link in lib
@@ -304,7 +297,7 @@
-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
- LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
../../$(OBJDIR)/$(*F).lib
# External plugin. Build as dll and copy to vm dir ($(OBJDIR)).
@@ -315,22 +308,19 @@
-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
- LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
+ COGDEFS="$(COGDEFS)" LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
FORCE:
#############################################################################
# Basic rules
-
+#
$(OBJDIR)/%.o: %.c $(wildcard $(CROSSDIR)/*.h) $(wildcard $(WIN32DIR)/*.h) $(wildcard $(MAKERDIR)/*.h)
$(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) -c $<
.c.s:
$(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCLUDES) $(DEFS) -c $<
-gnu-interp.c: interp.c $(GNUIFY)
- $(AWK) -f $(GNUIFY) $< > $(VMDIR)/$@
-
.rc.res:
$(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@
@@ -344,7 +334,6 @@
#############################################################################
# Extra specific dependencies
#
-
sqNamedPrims.h: plugins.int mkNamedPrims.exe
./mkNamedPrims.exe $(INTERNAL_PLUGINS) > sqNamedPrims.h
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext 2014-06-11 13:19:12 UTC (rev 2978)
@@ -2,7 +2,6 @@
# N.B. SqueakSSL is not ready for prime time. Compiles but does not link fully.
# See platforms/win32/plugins/SqueakSSL/Makefile
EXTERNAL_PLUGINS = \
-BochsIA32Plugin \
SqueakFFIPrims \
Win32OSProcessPlugin
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-06-11 13:19:12 UTC (rev 2978)
@@ -9,7 +9,7 @@
CONFIGURATION=product
# The name of the VM to build
-VM:=Croquet
+VM:=Squeak
VM_NAME?=$(VM)
# Is this a Croquet VM (defaults to OGL instead of D3D)?
@@ -35,7 +35,7 @@
OBJDIR:= $(BLDDIR)/vm
# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below
-PLATDIR:=../platforms
+PLATDIR:=../../platforms
CROSSDIR:=$(PLATDIR)/Cross/vm
WIN32DIR:=$(PLATDIR)/win32/vm
MAKERDIR:=$(VMSRCDIR)/vm
@@ -113,18 +113,16 @@
else ifeq ("$(CONFIGURATION)","assert")
OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer
DEBUGVM=0
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+# Disable bytecode profiling labels in interpret for debugging
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
else
OFLAGS:= -D_MT -march=pentium4
DEBUGVM=1
-NDEBUG:=-DAllocationCheckFiller=0xADD4E55
+# Disable bytecode profiling labels in interpret for debugging
+NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo) 0'
endif
-ifeq ("$(THREADING)","multi")
-COGDEFS:=-DCOGMTVM=1 -DDEBUGVM=$(DEBUGVM)
-else
-COGDEFS:=-DCOGMTVM=0 -DDEBUGVM=$(DEBUGVM)
-endif
+COGDEFS:=-DDEBUGVM=$(DEBUGVM)
# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h)
WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501
@@ -134,7 +132,7 @@
NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:= -DDEBUGVM=$(DEBUGVM) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
+DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
XDEFS:= -DSQUEAK_BUILTIN_PLUGIN
@@ -145,21 +143,18 @@
#
# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols
# The switch '-mwindows' gives us a GUI app instead of a console app.
+# Newer cygwins want --export-all-symbols in place of --export-dynamic.
#
LD:= gcc
LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-dynamic -L/usr/lib/mingw
CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-dynamic -L/usr/lib/mingw
+#LDFLAGS:= -mno-cygwin -mwindows -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
+#CONSOLELDFLAGS:= -mno-cygwin -mconsole -mthreads -Wl,--export-all-symbols -L/usr/lib/mingw
STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \
- -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
+ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \
-ldsound -lsecur32
#############################################################################
-# Gnuifier settings
-#
-AWK:= gawk
-GNUIFY:= $(PLATDIR)/win32/misc/gnuify
-
-#############################################################################
# Tools to use
#
AR:= ar rc
@@ -176,7 +171,8 @@
# Note: RC compiles the .rc files into linkable .o files
#
RC:= windres
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32
+SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
@@ -188,6 +184,9 @@
#
default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE)
+svnver:
+ echo $(RC) $(RCFLAGS)
+
product:;
$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default
@@ -200,21 +199,17 @@
# Do make init to allow make -n to function.
init: $(OBJDIR) eitheror.exe mkNamedPrims.exe
+cleanall: clean cleanast cleandbg
+
clean:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build
-cleanmt:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmt
-
cleanast:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast
-cleanmtast:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast
+cleandbg:
+ rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg
-cleanmtdbg:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg
-
print-settings:
@echo ---------------- Makefile settings ------------------
@echo CONFIGURATION=$(CONFIGURATION)
@@ -223,6 +218,7 @@
@echo CFLAGS=$(CFLAGS)
@echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS)
@echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS)
+ @echo OBJDIR=$(OBJDIR)
@echo LIBS=$(LIBS)
@echo DLLS=$(DLLS)
@echo -----------------------------------------------------
@@ -235,6 +231,9 @@
eitheror.exe: $(WIN32UTILDIR)/eitheror.c
$(CC) -o $@ -O1 -mconsole -mno-cygwin $<
+mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c
+ $(CC) -o $@ -O1 -mconsole -mno-cygwin $<
+
mkNamedPrims.exe: $(WIN32UTILDIR)/mkNamedPrims.c
$(CC) -o $@ -mconsole -mno-cygwin $<
@@ -246,7 +245,7 @@
vm: $(VMEXE)
-$(VMEXE): $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ)
+$(VMEXE): $(OBJDIR) $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ)
$(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c
$(LD) $(LDFLAGS) -o $(VMEXE) \
$(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ)
@@ -287,7 +286,6 @@
#############################################################################
# Building plugins
#
-
.PHONY: FORCE
# Internal plugin. Build as lib then link in lib
@@ -316,16 +314,13 @@
#############################################################################
# Basic rules
-
+#
$(OBJDIR)/%.o: %.c $(wildcard $(CROSSDIR)/*.h) $(wildcard $(WIN32DIR)/*.h) $(wildcard $(MAKERDIR)/*.h)
$(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) -c $<
.c.s:
$(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCLUDES) $(DEFS) -c $<
-gnu-interp.c: interp.c $(GNUIFY)
- $(AWK) -f $(GNUIFY) $< > $(VMDIR)/$@
-
.rc.res:
$(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@
@@ -339,7 +334,6 @@
#############################################################################
# Extra specific dependencies
#
-
sqNamedPrims.h: plugins.int mkNamedPrims.exe
./mkNamedPrims.exe $(INTERNAL_PLUGINS) > sqNamedPrims.h
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin 2014-06-11 13:19:12 UTC (rev 2978)
@@ -33,8 +33,8 @@
DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include
INCLUDES:= -I. -I$(DXDIR) \
- -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
- -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
+ -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \
+ -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR)
#############################################################################
# If no source files were given, use standard set
Modified: branches/Cog/build.win32x86/squeak.stack.v3/plugins.ext
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/plugins.ext 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/build.win32x86/squeak.stack.v3/plugins.ext 2014-06-11 13:19:12 UTC (rev 2978)
@@ -2,7 +2,6 @@
# N.B. SqueakSSL is not ready for prime time. Compiles but does not link fully.
# See platforms/win32/plugins/SqueakSSL/Makefile
EXTERNAL_PLUGINS = \
-BochsIA32Plugin \
SqueakFFIPrims \
Win32OSProcessPlugin
Deleted: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2014-06-11 00:49:03 UTC (rev 2977)
+++ branches/Cog/scripts/mkvmarchives 2014-06-11 13:19:12 UTC (rev 2978)
@@ -1,131 +0,0 @@
-#!/bin/sh
-IFS="
-"
-NSB=nscogbuild
-#NSB=nsbuild
-if [ $# = 0 ]; then
-CL=1
-CM=1
-CW=1
-CTL=1
-CTM=1
-CTW=1
-NL=1
-NM=1
-NW=1
-else
-CL=
-CM=
-CW=
-CTL=
-CTM=
-CTW=
-NL=
-NM=
-NW=
- while [ -n "$1" ]; do
- case $1 in
- -c) CL=1;CM=1;CW=1;CTL=1;CTM=1;CTW=1;;
- -cl) CL=1;;
- -cm) CM=1;;
- -cw) CW=1;;
- -ctl) CTL=1;;
- -ctm) CTM=1;;
- -ctw) CTW=1;;
- -n) NL=1;NM=1;NW=1;;
- -nl) NL=1;;
- -nm) NM=1;;
- -nw) NW=1;;
- -l) CL=1;CTL=1;NL=1;;
- -m) CM=1;CTM=1;NM=1;;
- -w) CW=1;CTW=1;NW=1;;
- -?|-h) echo usage: $0 [-c -n -l -m -w -c[lmw] -ct[lmw] -n[lmw]]; exit 0
- esac
- shift
- done
-fi
-EXES=
-REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \
- | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-TAG=`date +%g.%U.`$REV
-echo REV=$REV TAG=$TAG
-if [ -n "$CL" ]; then
- rm -rf coglinux-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf coglinux-$TAG.tgz coglinux
- EXES="$EXES coglinux/lib/squeak/[0-9.-]*/squeak"
- rm -rf coglinuxht-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf coglinuxht-$TAG.tgz coglinuxht
- EXES="$EXES coglinuxht/lib/squeak/[0-9.-]*/squeak"
-fi
-if [ -n "$CTL" ]; then
- rm -rf cogmtlinux-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf cogmtlinux-$TAG.tgz cogmtlinux
- EXES="$EXES cogmtlinux/lib/squeak/[0-9.-]*/squeak"
- rm -rf cogmtlinuxht-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf cogmtlinuxht-$TAG.tgz cogmtlinuxht
- EXES="$EXES cogmtlinuxht/lib/squeak/[0-9.-]*/squeak"
-fi
-if [ -n "$CM" ]; then
- test -d Cog.app || mkdir Cog.app
- rm -rf Cog.app/* Cog.app-$TAG.tgz
- (cd macbuild/Fast.app>/dev/null;tar cf - *)|(cd Cog.app;tar xvf -)
- tar czf Cog.app-$TAG.tgz Cog.app
- EXES="$EXES Cog.app/Contents/MacOS/Squeak"
-fi
-if [ -n "$CTM" ]; then
- test -d CogMT.app || mkdir CogMT.app
- rm -rf CogMT.app/* CogMT.app-$TAG.tgz
- (cd macbuild/FastMT.app>/dev/null;tar cf - *)|(cd CogMT.app;tar xvf -)
- tar czf CogMT.app-$TAG.tgz CogMT.app
- EXES="$EXES CogMT.app/Contents/MacOS/Squeak"
-fi
-if [ -n "$CW" ]; then
- test -d cogwin || mkdir cogwin
- rm -rf cogwin/* cogwin-$TAG.zip
- ln cygwinbuild/build/vm/{Squeak.exe,Squeak.ini,Squeak.map,Squeak.exe.manifest} cogwin
- ln cygwinbuild/build/vm/{SqueakConsole.exe,SqueakConsole.ini,SqueakConsole.map} cogwin
- ln cygwinbuild/build/vm/*.dll cogwin
- zip -vr cogwin-$TAG.zip cogwin
- EXES="$EXES cogwin/Squeak.exe"
-fi
-if [ -n "$CTW" ]; then
- test -d cogmtwin || mkdir cogmtwin
- rm -rf cogmtwin/* cogmtwin-$TAG.zip
- ln cygwinbuild/buildmt/vm/{Squeak.exe,Squeak.ini,Squeak.map,Squeak.exe.manifest} cogmtwin
- ln cygwinbuild/buildmt/vm/{SqueakConsole.exe,SqueakConsole.ini,SqueakConsole.map} cogmtwin
- ln cygwinbuild/buildmt/vm/*.dll cogmtwin
- zip -vr cogmtwin-$TAG.zip cogmtwin
- EXES="$EXES cogmtwin/Squeak.exe"
-fi
-if [ -n "$NL" ]; then
- rm -rf nsvmlinux-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf nsvmlinux-$TAG.tgz nsvmlinux
- EXES="$EXES nsvmlinux/lib/nsvm/4.0-$REV/nsvm"
- rm -rf nsvmlinuxht-$TAG.tgz
- COPYFILE_DISABLE=1 tar czf nsvmlinuxht-$TAG.tgz nsvmlinuxht
- EXES="$EXES nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm"
-fi
-if [ -n "$NM" ]; then
- test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app
- rm -rf Newspeak\ Virtual\ Machine.app/* Newspeak\ Virtual\ Machine.app-$TAG.tgz
- (cd $NSB/macbuild/Fast.app>/dev/null;tar cf - *)|(cd Newspeak\ Virtual\ Machine.app;tar xvf -)
- tar czf Newspeak\ Virtual\ Machine.app-$TAG.tgz Newspeak\ Virtual\ Machine.app
- EXES="$EXES Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"
-fi
-if [ -n "$NW" ]; then
- test -d nsvmwin || mkdir nsvmwin
- rm -rf nsvmwin/* nsvmwin-$TAG.zip
- ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map,nsvm.exe.manifest} nsvmwin
- ln $NSB/cygwinbuild/build/vm/*.dll nsvmwin
- zip -vr nsvmwin-$TAG.zip nsvmwin
- EXES="$EXES nsvmwin/nsvm.exe"
-fi
-for vm in $EXES
-do
- echo
- echo checking $vm version
-# strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//'
- strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | sed 's/ uuid:.*//'
- echo checking $vm for asserts
- strings - $vm | grep "assert[^0-9]*[0-9][0-9][0-9]"
-done 2>&1 | tee MVALOG
More information about the Vm-dev
mailing list