From a857c3d76feb46c758cbcca8064a90a9a3c88c5c Mon Sep 17 00:00:00 2001
From: Shevek <shevek@anarres.org>
Date: Wed, 7 May 2008 17:01:57 +0000
Subject: dev towards 1.2 release?

---
 etc/global.xml             |  4 +---
 etc/targets/global-tar.xml | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'etc')

diff --git a/etc/global.xml b/etc/global.xml
index 052ea6b..41bf829 100644
--- a/etc/global.xml
+++ b/etc/global.xml
@@ -9,11 +9,9 @@
 	<property file="${global.dir.etc}/log4j.properties" />
 
 	<path id="compile-classpath">
-		<!--
 		<fileset dir="${global.dir.lib}">
-			<include name="**/*.jar"/>
+			<include name="runtime/**/*.jar"/>
 		</fileset>
-		-->
 	</path>
 
 	<path id="runtime-classpath">
diff --git a/etc/targets/global-tar.xml b/etc/targets/global-tar.xml
index 1b053ae..05412be 100644
--- a/etc/targets/global-tar.xml
+++ b/etc/targets/global-tar.xml
@@ -2,7 +2,7 @@
 
 <project name="global-tar" basedir=".">
 
-    <target name="global-tar" depends="global-jar,global-javadoc">
+    <target name="global-tar-dir" depends="global-jar">
 		<mkdir dir="${global.dir.build.dist}" />
 		<mkdir dir="${global.dir.build.tar}/lib" />
 		<mkdir dir="${global.dir.build.tar}/bin" />
@@ -12,6 +12,9 @@
 			<fileset dir="${global.dir.lib}/log4j">
 				<include name="**/*.jar" />
 			</fileset>
+			<fileset dir="${global.dir.lib}/runtime">
+				<include name="**/*.jar" />
+			</fileset>
 			<mapper type="flatten" />
 		</copy>
 
@@ -24,19 +27,6 @@
 			</fileset>
 		</copy>
 
-		<copy todir="${global.dir.build.tar}/docs/api">
-			<fileset dir="${global.dir.build.javadoc}" />
-		</copy>
-
-<!--
-		<copy todir="${global.dir.build.tar}/docs/examples">
-			<fileset
-					dir="${global.dir.build.java}/org/anarres/cpp/examples">
-				<include name="**" />
-			</fileset>
-		</copy>
--->
-
 		<chmod perm="a+x">
 		    <fileset dir="${global.dir.build.tar}/bin">
 			    <include name="**/*.pl"/>
@@ -44,9 +34,19 @@
 		    <fileset dir="${global.dir.build.tar}">
 			    <include name="*.sh"/>
 			</fileset>
+		    <fileset dir="${global.dir.build.tar}">
+			    <include name="jcpp"/>
+			</fileset>
 		</chmod>
 
 		<!-- <runtarget target="global-inject" /> -->
+	</target>
+
+    <target name="global-tar" depends="global-tar-dir,global-javadoc">
+
+		<copy todir="${global.dir.build.tar}/docs/api">
+			<fileset dir="${global.dir.build.javadoc}" />
+		</copy>
 
 		<tar
 				destfile="${global.file.bintar}"
-- 
cgit v1.2.3