[svn] r7749: nemerle/trunk: Nemerle.build lib/lib.build
macros/macros.build misc/CopyFiles.build misc/pack...
pbludov
svnadmin at nemerle.org
Thu Jul 12 13:14:25 CEST 2007
Log:
Wix package fix for x64
Author: pbludov
Date: Thu Jul 12 13:14:19 2007
New Revision: 7749
Added:
nemerle/trunk/lib/lib.build
nemerle/trunk/macros/macros.build
nemerle/trunk/misc/CopyFiles.build
Modified:
nemerle/trunk/Nemerle.build
nemerle/trunk/misc/packages/wix/buildSetup.cmd
nemerle/trunk/misc/packages/wix/src/Version.wxi
nemerle/trunk/ncc/ncc.build
Modified: nemerle/trunk/Nemerle.build
==============================================================================
--- nemerle/trunk/Nemerle.build (original)
+++ nemerle/trunk/Nemerle.build Thu Jul 12 13:14:19 2007
@@ -80,9 +80,10 @@
<property name="configuration" value="debug" if="${ncc.debug}" />
<property name="configuration" value="release" unless="${ncc.debug}" />
+ <property name="dir.final" value="${path::combine(environment::get-folder-path('ProgramFiles'), 'Nemerle')}" />
<property name="dir.top" value="${path::get-full-path('.')}" />
<property name="dir.boot" value="${path::get-full-path('boot')}" />
- <property name="dir.out" value="${path::get-full-path(path::combine('bin', property::get-value('configuration')))}" />
+ <property name="dir.out" value="${path::get-full-path(path::combine('../bin', property::get-value('configuration')))}" />
<target name="clean">
<delete dir="${property::get-value('dir.out')}" />
@@ -98,8 +99,20 @@
<target name="build" description="Build all.">
<fail message="Please run `nant configure' first." if="${not file::exists('Nemerle.include')}"/>
- <nant buildfile="${path::combine('tools', 'tools.build')}" target="build"/>
+ <!-- Phase one -->
+ <nant buildfile="${path::combine('misc', 'CopyFiles.build')}" target="boot2final"/>
+ <nant buildfile="${path::combine('lib', 'lib.build')}" target="build"/>
+ <nant buildfile="${path::combine('macros', 'macros.build')}" target="build"/>
+ <nant buildfile="${path::combine('ncc', 'ncc.build')}" target="build"/>
+
+ <!-- Phase two -->
+ <nant buildfile="${path::combine('misc', 'CopyFiles.build')}" target="out2final"/>
+ <nant buildfile="${path::combine('lib', 'lib.build')}" target="build"/>
+ <nant buildfile="${path::combine('macros', 'macros.build')}" target="build"/>
<nant buildfile="${path::combine('ncc', 'ncc.build')}" target="build"/>
+
+ <!-- build the rest -->
+ <nant buildfile="${path::combine('tools', 'tools.build')}" target="build"/>
</target>
<target name="clean" description="Cleanup all.">
Added: nemerle/trunk/lib/lib.build
==============================================================================
--- (empty file)
+++ nemerle/trunk/lib/lib.build Thu Jul 12 13:14:19 2007
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="Nemerle runtime" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+ <description>
+ Copyright (c) 2003-2007 The University of Wroclaw.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the University may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL THE UNIVERSITY BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ You must not remove this notice, or any other, from this software.
+
+ </description>
+
+ <include buildfile="../Nemerle.include" unless="${property::exists('dir.top')}" />
+
+ <target name="build.lib">
+ <mkdir dir="${dir.out}" />
+ <ncc
+ output ="${dir.out}/Nemerle.dll" target="library"
+ define ="${ncc.defines}"
+ debug ="${ncc.debug}"
+ keyfile ="${ncc.keyfile}"
+ >
+ <arg value="-nostdlib" />
+ <!-- do not report warnings for obsolete members -->
+ <arg value="-nowarn:618" />
+ <references>
+ <include name="mscorlib.dll" />
+ <include name="System.dll" />
+ <include name="System.Xnl.dll" />
+ </references>
+ <sources>
+ <include name="AssemblyInfo.n" />
+ <include name="LazyValue.n" />
+ <include name="PipeReader.n" />
+ <include name="PipeWriter.n" />
+ <include name="concurrency.n" />
+ <include name="core.n" />
+ <include name="getopt.n" />
+ <include name="hashtable.n" />
+ <include name="heap.n" />
+ <include name="icloneable.n" />
+ <include name="icollection.n" />
+ <include name="input.n" />
+ <include name="internal-array.n" />
+ <include name="internal-numbered.n" />
+ <include name="internal.n" />
+ <include name="linkedlist.n" />
+ <include name="list.n" />
+ <include name="listenumerator.n" />
+ <include name="macros.n" />
+ <include name="narray.n" />
+ <include name="nstring.n" />
+ <include name="oldapi.n" />
+ <include name="option.n" />
+ <include name="pair.n" />
+ <include name="queue.n" />
+ <include name="rlist.n" />
+ <include name="set.n" />
+ <include name="stack.n" />
+ <include name="tree.n" />
+ </sources>
+ </ncc>
+ </target>
+
+ <target name="build" depends="build.lib"/>
+
+</project>
Added: nemerle/trunk/macros/macros.build
==============================================================================
--- (empty file)
+++ nemerle/trunk/macros/macros.build Thu Jul 12 13:14:19 2007
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="Nemerle.Macros" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+ <description>
+ Copyright (c) 2003-2007 The University of Wroclaw.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the University may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL THE UNIVERSITY BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ You must not remove this notice, or any other, from this software.
+
+ </description>
+
+ <include buildfile="../Nemerle.include" unless="${property::exists('dir.top')}" />
+
+ <target name="build.macros">
+ <mkdir dir="${dir.out}" />
+ <ncc
+ output ="${dir.out}/Nemerle.Macros.dll" target="library"
+ define ="${ncc.defines}"
+ debug ="${ncc.debug}"
+ keyfile ="${ncc.keyfile}"
+ >
+ <sources>
+ <include name="*.n" />
+ </sources>
+ <references basedir="${dir.out}">
+ <include name="Nemerle.Compiler.dll" />
+ <include name="System.Data.dll" />
+ </references>
+ </ncc>
+ </target>
+
+ <target name="build" depends="build.macros"/>
+
+</project>
Added: nemerle/trunk/misc/CopyFiles.build
==============================================================================
--- (empty file)
+++ nemerle/trunk/misc/CopyFiles.build Thu Jul 12 13:14:19 2007
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="Files" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+ <description>
+ Copyright (c) 2003-2007 The University of Wroclaw.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the University may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL THE UNIVERSITY BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ You must not remove this notice, or any other, from this software.
+
+ </description>
+
+ <include buildfile="../Nemerle.include" unless="${property::exists('dir.top')}" />
+
+ <target name="boot2final" description="Copy files from the boot folder to final output folder.">
+
+ <mkdir dir="${dir.final}" />
+ <copy todir="${dir.final}">
+ <fileset basedir="${dir.boot}">
+ <include name="Nemerle.dll" />
+ <include name="Nemerle.Compiler.dll" />
+ <include name="Nemerle.Macros.dll" />
+ <include name="ncc.exe" />
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="out2final" description="Copy files from the temporary output folder to final output folder.">
+
+ <mkdir dir="${dir.final}" />
+ <copy todir="${dir.final}">
+ <fileset basedir="${dir.out}">
+ <include name="Nemerle.dll" />
+ <include name="Nemerle.Compiler.dll" />
+ <include name="Nemerle.Macros.dll" />
+ <include name="ncc.exe" />
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="build" />
+
+</project>
Modified: nemerle/trunk/misc/packages/wix/buildSetup.cmd
==============================================================================
--- nemerle/trunk/misc/packages/wix/buildSetup.cmd (original)
+++ nemerle/trunk/misc/packages/wix/buildSetup.cmd Thu Jul 12 13:14:19 2007
@@ -36,10 +36,15 @@
if not "%WixDir%"=="" goto wixSet
rem Check default wix folder
-if not exist "%ProgramFiles%\Windows Installer XML v3\bin\light.exe" goto errEnvVarWix
-
+if not exist "%ProgramFiles%\Windows Installer XML v3\bin\light.exe" goto wixWow64check
echo light.exe found in "%ProgramFiles%\Windows Installer XML v3\bin" folder
set WixDir=%ProgramFiles%\Windows Installer XML v3\bin
+goto wixSet
+
+:wixWow64check
+if not exist "%ProgramFiles(x86)%\Windows Installer XML v3\bin\light.exe" goto errEnvVarWix
+echo light.exe found in "%ProgramFiles(x86)%\Windows Installer XML v3\bin" folder
+set WixDir=%ProgramFiles(x86)%\Windows Installer XML v3\bin
:wixSet
Modified: nemerle/trunk/misc/packages/wix/src/Version.wxi
==============================================================================
--- nemerle/trunk/misc/packages/wix/src/Version.wxi (original)
+++ nemerle/trunk/misc/packages/wix/src/Version.wxi Thu Jul 12 13:14:19 2007
@@ -30,8 +30,8 @@
<Include>
<?define ProductShortName = "Nemerle" ?>
-<?define ProductVersion = "0.9.4.7676" ?>
-<?define ProductVersionText = "0.9.4 (MAY 2007 CTP) build 7676" ?>
+<?define ProductVersion = "0.9.4.7711" ?>
+<?define ProductVersionText = "0.9.4 (JUN 2007 CTP) build 7711" ?>
<?define Manufacturer = "Nemerle.org" ?>
<?define ProductCode = "A55CE804-9111-4F23-B499-E9DAD3D4DFAD" ?>
<?define UpgradeCode = "A87511AC-0F24-4144-8211-99183084A71A" ?>
Modified: nemerle/trunk/ncc/ncc.build
==============================================================================
--- nemerle/trunk/ncc/ncc.build (original)
+++ nemerle/trunk/ncc/ncc.build Thu Jul 12 13:14:19 2007
@@ -66,7 +66,7 @@
<sources>
<include name="main.n" />
</sources>
- <references basedir="${dir.boot}">
+ <references basedir="${dir.out}">
<include name="Nemerle.Compiler.dll" />
</references>
</ncc>
More information about the svn
mailing list