[commit] r2500 - Update some scripts and installer makefiles.

 
Author: eliot
Date: 2011-10-10 11:03:19 -0700 (Mon, 10 Oct 2011)
New Revision: 2500

Modified:
   branches/Cog/nscogbuild/cygwinbuild/installer/Makefile
   branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk
   branches/Cog/nscogbuild/macbuild/installer/Makefile
   branches/Cog/scripts/mkvmarchives
   branches/Cog/scripts/uploadvms
Log:
Update some scripts and installer makefiles.


Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2011-10-09 17:16:26 UTC (rev 2499)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2011-10-10 18:03:19 UTC (rev 2500)
@@ -25,6 +25,14 @@
 icon.o: ../nsvm.rc
  $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@
 
+$(VM_EXECUTABLE): ../build/vm/$(VM_EXECUTABLE)
+ rm -f $@
+ cp $< $@
+
+$(VM_EXECUTABLE_MAP): ../build/vm/$(VM_EXECUTABLE_MAP)
+ rm -f $@
+ cp $< $@
+
 echovars:
  @echo '$$(VERSION)='$(VERSION)
  @echo '$$(VM_ICON)='$(VM_ICON)

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-10-09 17:16:26 UTC (rev 2499)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-10-10 18:03:19 UTC (rev 2500)
@@ -122,11 +122,11 @@
  echo $(foreach docfile,$(strip $(DOCUMENTATION_FILES)), '$(notdir $(docfile))' '$(call dosname,$(notdir $(docfile)))' '$(notdir $(docfile))') | xargs -r -n 3 printf '%s\tDocumentation\t%s|%s\t0\t\t\t16896\t1\n' >> $@.tmp
  mv $@.tmp $@
 
-#files.cab: files.ddf $(VM_EXECUTABLE) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) $(SOURCEFILENAME2)
+#files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) $(SOURCEFILENAME2)
 # makecab /D SourcesDir='$(shell cygpath -wa $(TOPDIR)/onebuild)' /f $<
 # @echo
 
-files.cab: files.ddf $(VM_EXECUTABLE) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1)
+files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1)
  makecab /D SourcesDir='$(shell cygpath -wa .)' /f $<
  @echo
 

Modified: branches/Cog/nscogbuild/macbuild/installer/Makefile
===================================================================
--- branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-10-09 17:16:26 UTC (rev 2499)
+++ branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-10-10 18:03:19 UTC (rev 2500)
@@ -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:
+$(VM_LOCALIZED_NAME_ESC).app: ../Fast.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
+ -ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
 
 # Cab contents:
 VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app

Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2011-10-09 17:16:26 UTC (rev 2499)
+++ branches/Cog/scripts/mkvmarchives 2011-10-10 18:03:19 UTC (rev 2500)
@@ -101,6 +101,7 @@
  test -d nsvmlinux/lib/squeak && mv nsvmlinux/lib/squeak nsvmlinux/lib/nsvm
  LIBDIR="`echo nsvmlinux/lib/nsvm/[0-9.-]*`"
  test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
+ rm -f nsvmlinux/lib/nsvm/npsqueak* $LIBDIR/npsqueak.so
 
  rm -rf nsvmlinux.tgz
  COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms 2011-10-09 17:16:26 UTC (rev 2499)
+++ branches/Cog/scripts/uploadvms 2011-10-10 18:03:19 UTC (rev 2500)
@@ -25,12 +25,22 @@
  -l) ARCHIVES="$ARCHIVES coglinux.tgz nsvmlinux.tgz";;
  -m) ARCHIVES="$ARCHIVES Cog.app.tgz Newspeak Virtual Machine.app.tgz";;
  -w) ARCHIVES="$ARCHIVES cogwin.tgz nsvmwin.tgz";;
- -?|-h)  echo usage: $0 [-l -m -w -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw]; exit 0
+ -?|-h)  echo usage: $0 [-l -m -w -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw]; exit 0;;
+ *) break
  esac
  shift
  done
 fi
 VER="`svnversion | sed 's/^.*://'`"
+case $VER in
+*M) echo -n "source tree is modified, are you sure you want to continue? "
+ read a
+ case $a in
+ y|Y) ;;
+ *) exit 1
+ esac
+ VER="`svnversion | sed 's/^.*://' | sed 's/M//'`";;
+esac
 echo $VER
 if [ ! -f README.$VER ]; then
  cat <<END >README.$VER
@@ -45,4 +55,4 @@
  vi README.$VER
 fi
 ssh -x [hidden email] mkdir mirandabanda.org/files/Cog/VM/VM.r$VER
-scp README.$VER $ARCHIVES [hidden email]:mirandabanda.org/files/Cog/VM/VM.r$VER
+scp README.$VER $ARCHIVES "$@" [hidden email]:mirandabanda.org/files/Cog/VM/VM.r$VER