From 0ea57f0dd0a012e62e868fd3f23fd6ee68475e45 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Sat, 4 Oct 2008 03:19:47 +0000
Subject: [PATCH] build.xml extended to build src jars

---
 build/build.xml                  | 174 ++++++++++++++++++++++++++++---
 build/compareSrcAndJarRT.bat     |   6 ++
 build/compareSrcAndJarTools.bat  |   6 ++
 build/compareSrcAndJarWeaver.bat |   6 ++
 4 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 build/compareSrcAndJarRT.bat
 create mode 100644 build/compareSrcAndJarTools.bat
 create mode 100644 build/compareSrcAndJarWeaver.bat

diff --git a/build/build.xml b/build/build.xml
index e1e9673b6..00b9333a3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,11 +40,11 @@
     <property name="module.name" value="${ant.project.name}"/>
     
     <import file="${modules.dir}/build/build-properties.xml"/>
+	
     <target name="init" depends="init-properties,init-directories">
       <property name="build.config" value=""/> 
       <property name="trim.testing.default" value="true"/>
-      <property name="aj.installer.jar" 
-            location="${aj.dist.dir}/aspectj-${build.version.long}.jar"/>
+      <property name="aj.installer.jar" location="${aj.dist.dir}/aspectj-${build.version.long}.jar"/>
 
       <available property="ant.lib.aspectjtools"
          file="${ant.home}/lib/aspectjtools.jar"
@@ -57,7 +57,6 @@
       <available property="testing.drivers.all.available"
          file="${aj.jar.dir}/testing-drivers-all.jar"
          value="${aj.jar.dir}/testing-drivers-all.jar"/>
-
     </target>
 
     <target name="version-uptodate" depends="init,init-taskdefs"
@@ -142,8 +141,7 @@
     <!-- antcall targets                                                       -->
     <!-- ===================================================================== -->	
 	
-	<target name="build-product" depends="init,init-taskdefs,init-version"
-	 description="build $${product.name}">
+	<target name="build-product" depends="init,init-taskdefs,init-version" description="build $${product.name}">
       <ajbuild jarDir="${aj.jar.dir}"
               baseDir="${aspectj.modules.dir}"
               distDir="${aj.dist.dir}"
@@ -343,10 +341,8 @@ To use testing client jar in tests,
 </echo>
 	</target>
 
-    <target name="aspectj" depends="init,aspectjtools-dist,docs-dist" 
-	  description="create installer from local distributions">
-	  <property name="installer.staging.dir"
-            location="${aj.temp.dir}/installer-staging"/>
+    <target name="aspectj" depends="init,aspectjtools-dist,docs-dist,src" description="create installer from local distributions">
+	  <property name="installer.staging.dir" location="${aj.temp.dir}/installer-staging"/>
 	  <clean-dir dir="${installer.staging.dir}"/>
 	  <copy todir="${installer.staging.dir}">
 	    <fileset dir="${aj.dist.dir}/tools"/>
@@ -354,12 +350,9 @@ To use testing client jar in tests,
 	  </copy>
 	  
 	  <antcall target="create-installer">
-	    <param name="installer.file" 
-	       location="${aj.installer.jar}"/>
-	    <param name="staging.dir" 
-	       location="${installer.staging.dir}"/>
-	    <param name="htmlSrc.dir" 
-	       location="${aspectj.modules.build.dir}/products/aspectj/install"/>
+	    <param name="installer.file" location="${aj.installer.jar}"/>
+	    <param name="staging.dir" location="${installer.staging.dir}"/>
+	    <param name="htmlSrc.dir" location="${aspectj.modules.build.dir}/products/aspectj/install"/>
 	    <param name="simpleClassName" value="ToolsInstaller"/>
 	  </antcall>
 	  <delete dir="${installer.staging.dir}"/> 
@@ -450,8 +443,7 @@ To use testing client jar in tests,
 		<build-module-all module="build"/>
     </target>
 
-	<target name="aspectjtools-dist" depends="init"
-	 description="build local distribution">
+	<target name="aspectjtools-dist" depends="init" description="build local distribution">
 	  <antcall target="build-product">
 	    <param name="product.name" value="tools"/>
 	  </antcall>
@@ -465,6 +457,154 @@ To use testing client jar in tests,
      	    description="create the Eclipse distribution plugins">	  
 	   <ant dir="${aspectj.modules.dir}/eclipse.plugin" inheritAll="false"/>
     </target>
+	
+	<target name="src" depends="init" description="build src modules">
+		
+		<jar destfile="${aj.src.dir}/aspectjrt${build.version}-src.jar">
+			<fileset dir="${aspectj.modules.dir}/aspectj5rt/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/runtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+		</jar>
+
+		<unzip dest="${aj.src.dir}/bcelsrc" src="${aspectj.modules.dir}/lib/bcel/bcel-src.zip"/>
+	    <!-- loadtime5/asm/bridge/loadtime/weaver/weaver5 -->
+		<jar destfile="${aj.src.dir}/aspectjweaver${build.version}-src.jar">
+			<fileset dir="${aspectj.modules.dir}/aspectj5rt/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/runtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+				<exclude name="**/*.html"/>
+			</fileset>
+			<fileset dir="${aj.src.dir}/bcelsrc">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/loadtime5/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/asm/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/bridge/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/loadtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/weaver/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/weaver5/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/util/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+		</jar>
+		
+        <!-- missing from this are the jdtDepends.jar src files -->
+		<unzip dest="${aj.src.dir}/jdtsrc" src="${aspectj.modules.dir}/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip"/>
+        <!-- ajde/ajde.core/ajdoc/asm/bridge/loadtime/org.aspectj.ajdt.core/taskdefs/util/weaver5 -->
+		<jar destfile="${aj.src.dir}/aspectjtools${build.version}-src.jar">
+			<fileset dir="${aj.src.dir}/jdtsrc">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aj.src.dir}/bcelsrc">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/loadtime5/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/loadtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/ajde/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/ajde.core/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/runtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/aspectj5rt/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/ajdoc/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/asm/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/bridge/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/loadtime/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/org.aspectj.ajdt.core/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/taskdefs/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/util/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/weaver/src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+			<fileset dir="${aspectj.modules.dir}/weaver5/java5-src">
+				<exclude name="CVS"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+		</jar>
+		<delete dir="${aj.src.dir}/bcelsrc" failonerror="false"/>
+		<delete dir="${aj.src.dir}/jdtsrc" failonerror="false"/>
+		
+		<jar destfile="${aj.src.dir}/org.aspectj-${build.version}-src.jar">
+			<fileset dir="${aj.src.dir}">
+				<include name="aspectjrt${build.version}-src.jar"/> 
+				<include name="aspectjweaver${build.version}-src.jar"/> 
+				<include name="aspectjtools${build.version}-src.jar"/>
+			</fileset>
+		</jar>
+		
+		<delete file="{aj.src.dir}/aspectjrt${build.version}-src.jar"/> 
+		<delete file="{aj.src.dir}/aspectjweaver${build.version}-src.jar"/> 
+		<delete file="{aj.src.dir}/aspectjtools${build.version}-src.jar"/> 
+    </target>
 
 </project>
 
diff --git a/build/compareSrcAndJarRT.bat b/build/compareSrcAndJarRT.bat
new file mode 100644
index 000000000..3bdb168b4
--- /dev/null
+++ b/build/compareSrcAndJarRT.bat
@@ -0,0 +1,6 @@
+@echo off
+echo "AspectJ Runtime Jar:   <=src  >=jar"
+jar -tvf ..\aj-build\src\aspectjrt-src.jar | cut -c37- | sed 's/.java$//' | sort > aspectjrtsrc.lst
+jar -tvf ..\aj-build\dist\tools\lib\aspectjrt.jar | cut -c37- | sed 's/.class$//' | grep -v "\$" | sort > aspectjrtjar.lst
+diff aspectjrtsrc.lst aspectjrtjar.lst
+erase aspectjrtsrc.lst aspectjrtjar.lst
diff --git a/build/compareSrcAndJarTools.bat b/build/compareSrcAndJarTools.bat
new file mode 100644
index 000000000..ce79610b8
--- /dev/null
+++ b/build/compareSrcAndJarTools.bat
@@ -0,0 +1,6 @@
+@echo off
+echo "AspectJ Tools Jar:   <=src  >=jar"
+jar -tvf ..\aj-build\src\aspectjtools-src.jar | cut -c37- | sed 's/.java$//' | sort > aspectjtoolssrc.lst
+jar -tvf ..\aj-build\dist\tools\lib\aspectjtools.jar | cut -c37- | sed 's/.class$//' | grep -v "\$" | sort > aspectjtoolsjar.lst
+diff aspectjtoolssrc.lst aspectjtoolsjar.lst
+erase aspectjtoolssrc.lst aspectjtoolsjar.lst
diff --git a/build/compareSrcAndJarWeaver.bat b/build/compareSrcAndJarWeaver.bat
new file mode 100644
index 000000000..7fbc10636
--- /dev/null
+++ b/build/compareSrcAndJarWeaver.bat
@@ -0,0 +1,6 @@
+@echo off
+echo "AspectJ Weaver Jar:   <=src  >=jar"
+jar -tvf ..\aj-build\src\aspectjweaver-src.jar | cut -c37- | sed 's/.java$//' | sort > aspectjweaversrc.lst
+jar -tvf ..\aj-build\dist\tools\lib\aspectjweaver.jar | cut -c37- | sed 's/.class$//' | grep -v "\$" | sort > aspectjweaverjar.lst
+diff aspectjweaversrc.lst aspectjweaverjar.lst
+erase aspectjweaversrc.lst aspectjweaverjar.lst
-- 
2.39.5