[Vm-dev] [commit] r2529 - Enable building vm-display-fbdev on
linux. Exclude fbdev in the newspeak build.
commits at squeakvm.org
commits at squeakvm.org
Thu Feb 2 22:45:41 UTC 2012
Author: eliot
Date: 2012-02-02 14:45:39 -0800 (Thu, 02 Feb 2012)
New Revision: 2529
Modified:
branches/Cog/nscogbuild/unixbuild/bld/mvm
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
branches/Cog/platforms/unix/config/configure
branches/Cog/platforms/unix/config/configure.ac
branches/Cog/platforms/unix/vm-display-fbdev/Makefile.in
branches/Cog/unixbuild/HowToBuild
branches/Cog/unixbuild/bld/mvm
branches/Cog/unixbuild/mtbld/mvm
Log:
Enable building vm-display-fbdev on linux. Exclude fbdev in the newspeak build.
Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bld/mvm 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2012-02-02 22:45:39 UTC (rev 2529)
@@ -5,7 +5,7 @@
*) OPT=-O2;;
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid"
../../../scripts/nukeversion
rm -rf ../../../nsvmlinux
# would prefer make install prefix=`readlink -f \`pwd\`/../../../nsvmlinux`
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Feb 1 18:00:12 PST 2012
+ Thu Feb 2 14:44:43 PST 2012
Modified: branches/Cog/platforms/unix/config/configure
===================================================================
--- branches/Cog/platforms/unix/config/configure 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/platforms/unix/config/configure 2012-02-02 22:45:39 UTC (rev 2529)
@@ -28390,7 +28390,7 @@
#[ --without-vm-sound-null disable null vm sound support [default=enabled]],
# [with_vm_sound_null="$withval"],
# [with_vm_sound_null="yes"])
-#if test "$with_vm_sound_null"="no"; then
+#if test "$with_vm_sound_null" = "no"; then
# AC_PLUGIN_DISABLE_PLUGIN(vm-sound-null);
#fi
@@ -28402,7 +28402,7 @@
else
with_vm_sound_OSS="yes"
fi;
-if test "$with_vm_sound_OSS"="no"; then
+if test "$with_vm_sound_OSS" = "no"; then
echo "$as_me:$LINENO: result: ******** disabling vm-sound-OSS" >&5
echo "${ECHO_T}******** disabling vm-sound-OSS" >&6
@@ -28415,9 +28415,9 @@
withval="$with_vm_display_fbdev"
with_vm_display_fbdev="$withval"
else
- with_display_fbdev="yes"
+ with_vm_display_fbdev="yes"
fi;
-if test "$with_display_fbdev"="no"; then
+if test "$with_vm_display_fbdev" = "no"; then
echo "$as_me:$LINENO: result: ******** disabling vm-display-fbdev" >&5
echo "${ECHO_T}******** disabling vm-display-fbdev" >&6
Modified: branches/Cog/platforms/unix/config/configure.ac
===================================================================
--- branches/Cog/platforms/unix/config/configure.ac 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/platforms/unix/config/configure.ac 2012-02-02 22:45:39 UTC (rev 2529)
@@ -356,7 +356,7 @@
#[ --without-vm-sound-null disable null vm sound support [default=enabled]],
# [with_vm_sound_null="$withval"],
# [with_vm_sound_null="yes"])
-#if test "$with_vm_sound_null"="no"; then
+#if test "$with_vm_sound_null" = "no"; then
# AC_PLUGIN_DISABLE_PLUGIN(vm-sound-null);
#fi
@@ -364,15 +364,15 @@
[ --without-vm-sound-OSS disable OSS vm sound support [default=enabled]],
[with_vm_sound_OSS="$withval"],
[with_vm_sound_OSS="yes"])
-if test "$with_vm_sound_OSS"="no"; then
+if test "$with_vm_sound_OSS" = "no"; then
AC_PLUGIN_DISABLE_PLUGIN(vm-sound-OSS);
fi
AC_ARG_WITH(vm-display-fbdev,
[ --without-vm-display-fbdev disable frame buffer vm display support [default=enabled]],
[with_vm_display_fbdev="$withval"],
- [with_display_fbdev="yes"])
-if test "$with_display_fbdev"="no"; then
+ [with_vm_display_fbdev="yes"])
+if test "$with_vm_display_fbdev" = "no"; then
AC_PLUGIN_DISABLE_PLUGIN(vm-display-fbdev);
fi
Modified: branches/Cog/platforms/unix/vm-display-fbdev/Makefile.in
===================================================================
--- branches/Cog/platforms/unix/vm-display-fbdev/Makefile.in 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/platforms/unix/vm-display-fbdev/Makefile.in 2012-02-02 22:45:39 UTC (rev 2529)
@@ -43,7 +43,7 @@
TARGET = vm-display-fbdev$a
OBJS = sqUnixFBDev$o
-XCFLAGS = $(X_CFLAGS) -Wall -Werror
+XCFLAGS = $(X_CFLAGS) -Wall -Werror -Wno-unknown-pragmas -Wno-pragmas
XINCLUDES = [includes] $(X_INCLUDES) \
-I$(topdir)/platforms/Cross/plugins/FilePlugin \
Modified: branches/Cog/unixbuild/HowToBuild
===================================================================
--- branches/Cog/unixbuild/HowToBuild 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/unixbuild/HowToBuild 2012-02-02 22:45:39 UTC (rev 2529)
@@ -29,24 +29,24 @@
svn co http://www.squeakvm.org/svn/squeak/branches/Cog/src
svn co http://www.squeakvm.org/svn/squeak/branches/Cog/unixbuild
3. Open a shell, cd into the unixbuild/bld directory and execute
- ../../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
+ ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
make install prefix=WhereYouWantTheVmToGo
N.B. On Ubuntu *do not* supply "LIBS=-lpthread", i.e. use
- ../../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"
+ ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0"
4. At the end of it you'll get a new VM in the path provided via -prefix
3a. For an assert-enabled VM do
- ../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
+ ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
3b. For a full debug VM do
- ../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak CFLAGS="-g3 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=1" LIBS=-lpthread
+ ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g3 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=1" LIBS=-lpthread
3c. For a multi-threaded VM open a shell and cd to the mtbld directory. Then
execute
- ../../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
+ ../../platforms/unix/config/configure INTERP=cointerpmt --without-npsqueak CFLAGS="-g -O2 -msse2 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1" LIBS=-lpthread
make squeakmt
make installmt prefix=WhereYouWantTheVmToGo
Modified: branches/Cog/unixbuild/bld/mvm
===================================================================
--- branches/Cog/unixbuild/bld/mvm 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/unixbuild/bld/mvm 2012-02-02 22:45:39 UTC (rev 2529)
@@ -5,7 +5,7 @@
*) OPT=-O2;;
esac
-test -f config.h || ../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
+test -f config.h || ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g $OPT -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=`(cd ../../;pwd)`/coglinux
Modified: branches/Cog/unixbuild/mtbld/mvm
===================================================================
--- branches/Cog/unixbuild/mtbld/mvm 2012-02-02 02:03:33 UTC (rev 2528)
+++ branches/Cog/unixbuild/mtbld/mvm 2012-02-02 22:45:39 UTC (rev 2529)
@@ -5,7 +5,7 @@
*) OPT=-O2;;
esac
-test -f config.h || ../../platforms/unix/config/configure INTERP=cointerpmt --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1" LIBS=-lpthread
+test -f config.h || ../../platforms/unix/config/configure INTERP=cointerpmt --without-npsqueak CFLAGS="-g $OPT -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=`(cd ../../;pwd)`/cogmtlinux
More information about the Vm-dev
mailing list