[svn] r7695: nemerle/trunk: configure
misc/packages/wix/buildSetup.cmd
misc/packages/wix/makedist.sh misc/...
nazgul
svnadmin at nemerle.org
Sun Jun 3 22:00:00 CEST 2007
Log:
Some preparations for building MSI
Author: nazgul
Date: Sun Jun 3 21:59:55 2007
New Revision: 7695
Added:
nemerle/trunk/misc/packages/wix/makedist.sh (contents, props changed)
Modified:
nemerle/trunk/configure
nemerle/trunk/misc/packages/wix/buildSetup.cmd
nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs
nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs
nemerle/trunk/ncc/Makefile
Modified: nemerle/trunk/configure
==============================================================================
--- nemerle/trunk/configure (original)
+++ nemerle/trunk/configure Sun Jun 3 21:59:55 2007
@@ -70,6 +70,8 @@
antlr_path=antlr
nant_path=nant
mono_gacutil=no
+vsplugindir=vsplugin
+wixpath=
############################################################
# FUNCTIONS
@@ -215,8 +217,10 @@
--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 how to execute AntLR [default: antlr]
- --nant-path=PATH how to execute NAnt [default: nant]
+ --antlr-path=PATH/CMD command to execute AntLR [default: antlr]
+ --nant-path=PATH/CMD command to execute NAnt [default: nant]
+ --wix-path=PATH path to directory, where your Wix is installed
+ --vsplugin-dir=PATH relative path to directory containing Visual Studio plugin directory [default: vsplugin]
--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
@@ -287,6 +291,12 @@
--nant-path=*)
nant_path=`echo $ac_option | cut -d '=' -f 2`
;;
+ --wix-path=*)
+ wixpath=`echo $ac_option | cut -d '=' -f 2`
+ ;;
+ --vsplugin-dir=*)
+ vsplugindir=`echo $ac_option | cut -d '=' -f 2`
+ ;;
--enable-debug)
csc_flags="$csc_flags -debug+"
net_flags="$net_flags --debug"
@@ -855,6 +865,9 @@
NANT = $nant
NANT_DIR = $nant_dir
+VSPLUGINDIR = $vsplugindir
+WIXPATH = $wixpath
+
NUNIT_CONSOLE = $nunit
NUNIT_LIB_FLAG = $nunit_lib
Modified: nemerle/trunk/misc/packages/wix/buildSetup.cmd
==============================================================================
--- nemerle/trunk/misc/packages/wix/buildSetup.cmd (original)
+++ nemerle/trunk/misc/packages/wix/buildSetup.cmd Sun Jun 3 21:59:55 2007
@@ -58,6 +58,8 @@
if errorlevel 1 goto done
cd "%~dp0"
+echo Wixing "%WixDir%"
+
"%WixDir%\candle.exe" -ext WixNetFxExtension -sw1080 src/*.wxs
if errorlevel 1 goto done
Added: nemerle/trunk/misc/packages/wix/makedist.sh
==============================================================================
--- (empty file)
+++ nemerle/trunk/misc/packages/wix/makedist.sh Sun Jun 3 21:59:55 2007
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -x
+set -e
+
+top=../../../
+
+NANT=`grep "NANT " ${top}config.mak | sed 's/.*= *//g'`
+VSPLUGINDIR="${top}"`grep "VSPLUGINDIR " ${top}config.mak | sed 's/.*= *//g'`
+
+tar=
+for x in `ls $top/nemerle-*.tar.gz` ; do
+ tar=$x
+done
+test -f $x || {
+ echo "No tarball found ($top/nemerle-*.tar.gz)"
+ exit 1
+}
+
+
+
+rm -rf dist
+mkdir -p dist/bin
+cp -f $top/tools/cs2n/*.dll dist/bin/
+cp -f $top/tools/cs2n/*.exe dist/bin/
+cp -f $top/tools/nemerlish/*.exe dist/bin/
+cp -f $top/tools/nemerlish/*.dll dist/bin/
+cp -f $top/tools/nemerlish/*.exe.config dist/bin/
+cp -f $top/tools/nant-task/*.dll dist/bin/
+cp -f $top/tools/msbuild-task/*.dll dist/bin/
+cp -f $top/tools/msbuild-task/N*.targets dist/bin/
+cp -f $top/ncc/out.stage3/*.exe dist/bin
+cp -f $top/ncc/out.stage3/*.dll dist/bin
+cp -f $top/ncc/*.xml dist/bin
+tar -C dist -zxf $tar
+mv dist/nemerle-*/doc/html dist/
+rm -rf dist/nemerle-*
+rm -f dist/bin/true.exe
+
+$NANT -buildfile:dist.build -D:dir.vs-plugin=$VSPLUGINDIR
Modified: nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs (original)
+++ nemerle/trunk/misc/packages/wix/src/CompilerAndTools.wxs Sun Jun 3 21:59:55 2007
@@ -107,7 +107,7 @@
<File Id="File_Nemerle.MSBuild.Tasks.dll" Name="Nemerle.MSBuild.Tasks.dll" Source="dist\bin\" >
<netfx:NativeImage Id="Image_Nemerle.MSBuild.Tasks.dll" Dependencies="no" />
</File>
- <File Id="File_Nemerle.MSBuild.Tasks.xml" Name="Nemerle.MSBuild.Tasks.xml" Source="dist\bin\" />
+ <!-- <File Id="File_Nemerle.MSBuild.Tasks.xml" Name="Nemerle.MSBuild.Tasks.xml" Source="dist\bin\" /> -->
<File Id="File_Nemerle.MSBuild.targets" Name="Nemerle.MSBuild.targets" Source="dist\bin\" />
</Component>
Modified: nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs (original)
+++ nemerle/trunk/misc/packages/wix/src/vs-plugin.wxs Sun Jun 3 21:59:55 2007
@@ -52,11 +52,11 @@
<File Id="File_Nemerle.Compiler.Utils.dll" Name="Nemerle.Compiler.Utils.dll" Source="dist\bin\" >
<netfx:NativeImage Id="Image_Nemerle.Compiler.Utils.dll" Dependencies="no" />
</File>
- <File Id="File_Nemerle.Compiler.Utils.xml" Name="Nemerle.Compiler.Utils.xml" Source="dist\bin\" />
+ <!-- <File Id="File_Nemerle.Compiler.Utils.xml" Name="Nemerle.Compiler.Utils.xml" Source="dist\bin\" />-->
<File Id="File_Nemerle.VisualStudio.dll" Name="Nemerle.VisualStudio.dll" Source="dist\bin\" >
<netfx:NativeImage Id="Image_Nemerle.VisualStudio.dll" Dependencies="no" />
</File>
- <File Id="File_Nemerle.VisualStudio.xml" Name="Nemerle.VisualStudio.xml" Source="dist\bin\" />
+ <!-- <File Id="File_Nemerle.VisualStudio.xml" Name="Nemerle.VisualStudio.xml" Source="dist\bin\" />-->
<File Id="File_Nemerle.VisualStudio.dll.config" Name="Nemerle.VisualStudio.dll.config" Source="dist\bin\" />
<!-- Remove mapping for .n files added by Simple VS Integration -->
Modified: nemerle/trunk/ncc/Makefile
==============================================================================
--- nemerle/trunk/ncc/Makefile (original)
+++ nemerle/trunk/ncc/Makefile Sun Jun 3 21:59:55 2007
@@ -351,7 +351,7 @@
-ref:out.stage3/Nemerle.dll -doc Nemerle.Compiler.xml
$(COMP) "[with xml doc generation]" Nemerle.Macros.xml
$(Q)$(RUN_COMPILER) -target-library -out:temp.dll $(STDMACROS_DLL_SRC) \
- -ref:out.stage3/Nemerle.dll -ref:out.stage3/Nemerle.Compiler.dll -doc Nemerle.Macros.xml
+ -ref:out.stage3/Nemerle.dll -ref:System.Data -ref:out.stage3/Nemerle.Compiler.dll -doc Nemerle.Macros.xml
$(Q)rm temp.dll
More information about the svn
mailing list