[svn] r5838: nemerle/trunk: configure misc/packages/msi/Makefile misc/packages/msi/makedist.sh misc/packag...

[nazgul]

Log:
Include MSBuild in compilation and msi packages. Change msi package to take compiler libraries from out.stage3 instead of boot

Author: nazgul
Date: Sat Oct 22 21:03:47 2005
New Revision: 5838

Modified:
   nemerle/trunk/configure
   nemerle/trunk/misc/packages/msi/Makefile
   nemerle/trunk/misc/packages/msi/makedist.sh
   nemerle/trunk/misc/packages/msi/msi.build
   nemerle/trunk/tools/Makefile
   nemerle/trunk/tools/msbuild-task/Makefile
   nemerle/trunk/tools/nant-task/Makefile

Modified: nemerle/trunk/configure
==============================================================================
--- nemerle/trunk/configure	(original)
+++ nemerle/trunk/configure	Sat Oct 22 21:03:47 2005
@@ -619,7 +619,7 @@
 fi
 
 # Step 10.
-# Check if we have ilasm tool available
+# Check if we have C# compiler available
 echo_check_for "C# compiler"
 
 try_execute "${netFRAMEWORK}csc"
@@ -732,6 +732,25 @@
 fi
 
 
+# Step 15.
+# Check if we have MSBuild available
+echo_check_for "MSBuild"
+
+try_execute "${netFRAMEWORK}MSBuild"
+if test $? -lt 126; then
+   echo_result found
+   msbuild="${netFRAMEWORK}MSBuild"
+else
+  try_execute "${monopath}xbuild"
+  if test $? -lt 126; then
+    echo_result found
+    msbuild="${monopath}xbuild"
+  else
+    echo_result "not found"
+  fi
+fi
+
+
 if test -d .svn; then
     svn_revision=`svn info . | awk '/^Revision:/ { print $2 }'`
 else
@@ -776,6 +795,7 @@
 PEVERIFY   = $peverify
 TIME       = $time
 ANTLR      = $antlr
+MSBUILD    = $msbuild
 
 MONO_GACUTIL = $mono_gacutil
 

Modified: nemerle/trunk/misc/packages/msi/Makefile
==============================================================================
--- nemerle/trunk/misc/packages/msi/Makefile	(original)
+++ nemerle/trunk/misc/packages/msi/Makefile	Sat Oct 22 21:03:47 2005
@@ -1,5 +1,7 @@
-all: dist
+all: Nemerle.msi
 	./go.sh
 
+Nemerle.msi: dist
+	
 dist:
 	./makedist.sh
\ No newline at end of file

Modified: nemerle/trunk/misc/packages/msi/makedist.sh
==============================================================================
--- nemerle/trunk/misc/packages/msi/makedist.sh	(original)
+++ nemerle/trunk/misc/packages/msi/makedist.sh	Sat Oct 22 21:03:47 2005
@@ -19,8 +19,10 @@
 cp -f $top/tools/nemerlish/*.exe dist/bin/
 cp -f $top/tools/nemerlish/*.dll dist/bin/
 cp -f $top/tools/nant-task/*.dll dist/bin/
-cp -f $top/boot/*.exe dist/bin
-cp -f $top/boot/*.dll dist/bin
+cp -f $top/tools/msbuild-task/*.dll dist/bin/
+cp -f $top/tools/msbuild-task/*.targets dist/bin/
+cp -f $top/ncc/out.stage3/*.exe dist/bin
+cp -f $top/ncc/out.stage3/*.dll dist/bin
 tar -C dist -zxf $tar
 mv dist/nemerle-*/doc/html dist/
 rm -rf dist/nemerle-*

Modified: nemerle/trunk/misc/packages/msi/msi.build
==============================================================================
--- nemerle/trunk/misc/packages/msi/msi.build	(original)
+++ nemerle/trunk/misc/packages/msi/msi.build	Sat Oct 22 21:03:47 2005
@@ -53,6 +53,8 @@
                         <include name="*.exe" />
                         <include name="Nemerle.Macros.dll" />
                         <include name="Nemerle.NAnt.Tasks.dll" />
+                        <include name="Nemerle.MSBuild.Tasks.dll" />                        
+                        <include name="Nemerle.MSBuild.targets" />
                     </fileset>
 	    </component>
 	    <component name="C__GAC" id="{C6C503B0-D02B-4F71-A7E3-C31010A018E5}" attr="2"
@@ -62,6 +64,7 @@
                         <include name="*.dll" />
                         <exclude name="Nemerle.Macros.dll" />
                         <exclude name="Nemerle.NAnt.Tasks.dll" />
+                        <exclude name="Nemerle.MSBuild.Tasks.dll" />
                     </fileset>
 	    </component>
                 <component name="C__Documentation" id="{3A7BD302-15FE-4B67-BC34-6A290F17D2E5}" attr="2"

Modified: nemerle/trunk/tools/Makefile
==============================================================================
--- nemerle/trunk/tools/Makefile	(original)
+++ nemerle/trunk/tools/Makefile	Sat Oct 22 21:03:47 2005
@@ -48,11 +48,13 @@
 	  $(MAKE) -C cs2n install; fi
 	$(Q)$(MAKE) -C nemerlish install
 	$(Q)$(MAKE) -C nant-task all install
-	$(Q)$(MAKE) -C msbuild-task all install
+#	$(Q)$(MAKE) -C msbuild-task all install
 
 uninstall:
 	$(Q)-$(MAKE) -C cs2n uninstall
 	$(Q)-$(MAKE) -C nemerlish uninstall
+#	$(Q)-$(MAKE) -C nant-task uninstall
+#	$(Q)-$(MAKE) -C msbuild-task uninstall
 
 clean:
 	$(MAKE) -C cs2n clean

Modified: nemerle/trunk/tools/msbuild-task/Makefile
==============================================================================
--- nemerle/trunk/tools/msbuild-task/Makefile	(original)
+++ nemerle/trunk/tools/msbuild-task/Makefile	Sat Oct 22 21:03:47 2005
@@ -60,12 +60,16 @@
 
 install: all
 	$(INST) Nemerle.MSBuild.Tasks.dll
-	$(Q)install -d $(DESTDIR)
-	$(Q)install -m755 Nemerle.MSBuild.Tasks.dll $(DESTDIR)
+	$(Q)install -m755 Nemerle.MSBuild.Tasks.dll $(DESTDIR)$(BINDIR)
+	$(Q)install -m644 Nemerle.MSBuild.targets $(DESTDIR)$(BINDIR)
 endif
 
 Nemerle.MSBuild.Tasks.dll: MSBuildTask.n
 	$(EXECUTE) $(TOP)/ncc/out.stage3/ncc.exe -q -r:Microsoft.Build.Tasks.dll -out $@ -t:library MSBuildTask.n
 
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/Nemerle.MSBuild.Tasks.dll
+	rm -f $(DESTDIR)$(BINDIR)/Nemerle.MSBuild.targets
+
 clean:
 	rm -f *.exe *.dll core core.[0-9]*

Modified: nemerle/trunk/tools/nant-task/Makefile
==============================================================================
--- nemerle/trunk/tools/nant-task/Makefile	(original)
+++ nemerle/trunk/tools/nant-task/Makefile	Sat Oct 22 21:03:47 2005
@@ -67,6 +67,9 @@
 Nemerle.NAnt.Tasks.dll: NantTask.n
 	$(EXECUTE) $(TOP)/ncc/out.stage3/ncc.exe -L:$(NANT_DIR) -q -greedy- -r NAnt.DotNetTasks.dll -r NAnt.Core.dll -out $@ -t:library NantTask.n
 
+uninstall:
+	rm -f $(DESTDIR)$(NANT_DIR)Nemerle.NAnt.Tasks.dll
+
 clean:
 	rm -f *.exe *.dll core core.[0-9]*