[Pkg-cli-apps-commits] r4455 - in /packages/ndoc/trunk/debian: NDoc.build NDoc.build.include changelog fix-build-system.diff rules
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Tue Jan 27 00:10:07 UTC 2009
Author: directhex-guest
Date: Tue Jan 27 00:10:07 2009
New Revision: 4455
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4455
Log:
Fixed fo'realz, tested with current orig
Added:
packages/ndoc/trunk/debian/fix-build-system.diff
Removed:
packages/ndoc/trunk/debian/NDoc.build
packages/ndoc/trunk/debian/NDoc.build.include
Modified:
packages/ndoc/trunk/debian/changelog
packages/ndoc/trunk/debian/rules
Modified: packages/ndoc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ndoc/trunk/debian/changelog?rev=4455&op=diff
==============================================================================
--- packages/ndoc/trunk/debian/changelog (original)
+++ packages/ndoc/trunk/debian/changelog Tue Jan 27 00:10:07 2009
@@ -18,14 +18,14 @@
+ Set nant target to mono-2.0
[ Jo Shields ]
- * debian/NDoc.build,
- debian/NDoc.build.include:
+ * debian/fix-build-system.diff:
+ Replace references to Mono 1.0 with Mono 2.0, as NDoc has a hard-coded
list of supported runtimes (and CLI 2.0 on Mono is not one of them)
* debian/rules:
+ Fix get-orig-source to correctly create a versioned directory, and clean
up afterwards
- + Inject fixed build files into orig
+ + Patch build system before calling nant (and unpatch afterwards) to
+ ensure a pure 2.0 build is used, even in the clean rule.
* debian/libndoc1.3-cil.install,
debian/ndoc-console.install:
+ Install from 2.0 dir, not 1.0 dir
Added: packages/ndoc/trunk/debian/fix-build-system.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ndoc/trunk/debian/fix-build-system.diff?rev=4455&op=file
==============================================================================
--- packages/ndoc/trunk/debian/fix-build-system.diff (added)
+++ packages/ndoc/trunk/debian/fix-build-system.diff Tue Jan 27 00:10:07 2009
@@ -1,0 +1,59 @@
+diff -urNad ndoc-1.3.1.orig/NDoc.build ndoc-1.3.1/NDoc.build
+--- ndoc-1.3.1.orig/NDoc.build 2005-01-24 22:22:58.000000000 +0000
++++ ndoc-1.3.1/NDoc.build 2009-01-26 23:55:58.000000000 +0000
+@@ -110,28 +110,28 @@
+ </if>
+ -->
+ <!--
+- build Mono 1.0 version if both Framework and SDK are available
++ build Mono 2.0 version if both Framework and SDK are available
+ -->
+- <if test="${framework::exists('mono-1.0')}">
+- <if test="${framework::sdk-exists('mono-1.0')}">
+- <call target="set-mono-1.0-framework-configuration" />
++ <if test="${framework::exists('mono-2.0')}">
++ <if test="${framework::sdk-exists('mono-2.0')}">
++ <call target="set-mono-2.0-framework-configuration" />
+ <call target="compile" />
+ </if>
+- <if test="${not framework::sdk-exists('mono-1.0')}">
++ <if test="${not framework::sdk-exists('mono-2.0')}">
+ <if test="${property::exists('project.build.package') and project.build.package}">
+- <fail message="The Mono SDK 1.0 is not available." />
++ <fail message="The Mono SDK 2.0 is not available." />
+ </if>
+ <if test="${not property::exists('project.build.package') or not project.build.package}">
+- <echo message="The Mono SDK 1.0 is not available. Build skipped." />
++ <echo message="The Mono SDK 2.0 is not available. Build skipped." />
+ </if>
+ </if>
+ </if>
+- <if test="${not framework::exists('mono-1.0')}">
++ <if test="${not framework::exists('mono-2.0')}">
+ <if test="${property::exists('project.build.package') and project.build.package}">
+- <fail message="Mono 1.0 is not available." />
++ <fail message="Mono 2.0 is not available." />
+ </if>
+ <if test="${not property::exists('project.build.package') or not project.build.package}">
+- <echo message="Mono 1.0 is not available. Build skipped." />
++ <echo message="Mono 2.0 is not available. Build skipped." />
+ </if>
+ </if>
+ </target>
+diff -urNad ndoc-1.3.1.orig/NDoc.build.include ndoc-1.3.1/NDoc.build.include
+--- ndoc-1.3.1.orig/NDoc.build.include 2004-10-01 03:30:24.000000000 +0100
++++ ndoc-1.3.1/NDoc.build.include 2009-01-26 23:55:58.000000000 +0000
+@@ -219,10 +219,10 @@
+ <!--
+
+ -->
+- <target name="set-mono-1.0-framework-configuration" depends="check-build-dir, check-current-build-config, check-build-debug, check-build-defines, check-build-optimize">
+- <property name="nant.settings.currentframework" value="mono-1.0" />
++ <target name="set-mono-2.0-framework-configuration" depends="check-build-dir, check-current-build-config, check-build-debug, check-build-defines, check-build-optimize">
++ <property name="nant.settings.currentframework" value="mono-2.0" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" readonly="false" />
+- <property name="current.build.defines" value="${build.defines},MONO,MONO_1_0" dynamic="true" readonly="false" />
++ <property name="current.build.defines" value="${build.defines},MONO,MONO_2_0" dynamic="true" readonly="false" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" readonly="false" />
+ <property name="current.bin.dir" value="${build.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" />
+ <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" />
Modified: packages/ndoc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ndoc/trunk/debian/rules?rev=4455&op=diff
==============================================================================
--- packages/ndoc/trunk/debian/rules (original)
+++ packages/ndoc/trunk/debian/rules Tue Jan 27 00:10:07 2009
@@ -9,14 +9,18 @@
build: patch build-stamp
build-stamp:
+ patch -p1 < debian/fix-build-system.diff
$(NANT) release compile-build
+ patch -p1 -R < debian/fix-build-system.diff
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -rf build
+ patch -p1 < debian/fix-build-system.diff
$(NANT) clean-build-dir
+ patch -p1 -R < debian/fix-build-system.diff
rm -rf .wapi
rm -f build-stamp
rm -f src/CommonAssemblyInfo.cs
@@ -68,7 +72,6 @@
mkdir -p ndoc-$(CURVER)
tar zxvf ../tarballs/ndoc_$(CURVER).orig.tar.gz -C ndoc-$(CURVER)
rm -rf ndoc-$(CURVER)/bin/
- cp debian/NDoc.build* ndoc-$(CURVER)/
tar cf ndoc_$(CURVER).orig.tar ndoc-$(CURVER)/
gzip -9 ndoc_$(CURVER).orig.tar
rm -r ndoc-$(CURVER)
More information about the Pkg-cli-apps-commits
mailing list