[svn] r5837: nemerle/trunk: configure misc/packages/msi/Makefile misc/packages/msi/go.sh

[nazgul]

Log:
Some more automation when building msi package

Author: nazgul
Date: Sat Oct 22 15:04:19 2005
New Revision: 5837

Added:
   nemerle/trunk/misc/packages/msi/Makefile   (contents, props changed)
Modified:
   nemerle/trunk/configure
   nemerle/trunk/misc/packages/msi/go.sh

Modified: nemerle/trunk/configure
==============================================================================
--- nemerle/trunk/configure	(original)
+++ nemerle/trunk/configure	Sat Oct 22 15:04:19 2005
@@ -67,6 +67,8 @@
 broken_swf=0
 monopath=
 antlr=
+antlr_path=
+nant_path=
 mono_gacutil=no
 
 ############################################################
@@ -202,6 +204,8 @@
   --net-flags=FLAGS     pass these flags to .NET engine
   --install-path=PATH   the path to a custom install program
   --dll-path=PATH       the path to dlls directory
+  --antlr-path=PATH     the path to where antlr resides
+  --nant-path=PATH      the path to where nant resides  
   --force-old-mono      use this switch to force using your version of
                         Mono .NET environment or if you don't use Mono
                         at all but have it installed
@@ -266,6 +270,12 @@
 	--dll-path=*)
             dll_path=`echo $ac_option | cut -d '=' -f 2`
             ;;        
+	--antlr-path=*)
+            antlr_path=`echo $ac_option | cut -d '=' -f 2`
+            ;;        
+	--nant-path=*)
+            nant_path=`echo $ac_option | cut -d '=' -f 2`
+            ;;        
 	--enable-debug)
 	    csc_flags="$csc_flags -debug+"
 	    net_flags="$net_flags --debug"
@@ -657,7 +667,7 @@
 # check for antlr for generating cs2n C# parser
 echo_check_for "antlr >= 2.7.5"
   # the debian antlr package uses a `runantlr' binary
-  antlrcommand=`which antlr 2>/dev/null || which runantlr 2>/dev/null`
+  antlrcommand=`which $antlr_path/antlr 2>/dev/null || which runantlr 2>/dev/null`
 
   # and the debian antlr version also didn't match with this
   # ver=`antlr 2>&1| head -1 | sed 's/.* \([0-9]*\.[0-9]\.[0-9]*\).*/\1/g'`
@@ -679,13 +689,13 @@
 
 # Step 13.
 echo_check_for "nant"
-try_execute nant
+try_execute $nant_path/nant
 if test $? -lt 126; then
     echo_result yes
-    nant=nant
+    nant=$nant_path/nant
     echo_check_for "nant plugin directory"
     rm -f misc/nant.dir
-    try_execute nant -buildfile:misc/print-dir.build
+    try_execute $nant_path/nant -buildfile:misc/print-dir.build
     nant_dir=`cat misc/nant.dir 2>/dev/null`
     rm -f misc/nant.dir
     if test "$nant_dir" ; then

Added: nemerle/trunk/misc/packages/msi/Makefile
==============================================================================
--- (empty file)
+++ nemerle/trunk/misc/packages/msi/Makefile	Sat Oct 22 15:04:19 2005
@@ -0,0 +1,5 @@
+all: dist
+	./go.sh
+
+dist:
+	./makedist.sh
\ No newline at end of file

Modified: nemerle/trunk/misc/packages/msi/go.sh
==============================================================================
--- nemerle/trunk/misc/packages/msi/go.sh	(original)
+++ nemerle/trunk/misc/packages/msi/go.sh	Sat Oct 22 15:04:19 2005
@@ -2,4 +2,7 @@
 
 TMP=/tmp 
 TEMP=/tmp
-$HOME/nant/NAnt -t:net-1.1 -v
+DIR=`dirname $0`
+NANT=`grep "NANT " ./$DIR/../../../config.mak | sed 's/.*=//g'`
+command=eval $NANT -t:net-2.0 -v
+$command