pax (7jun22)

git-svn-id: svn://tug.org/texlive/trunk@63508 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 77 insertions, 29 deletions

diff --git a/Master/texmf-dist/source/latex/pax/Makefile b/Master/texmf-dist/source/latex/pax/Makefile
new file mode 100644
index 00000000000..944ee43ded6
--- /dev/null
+++ b/Master/texmf-dist/source/latex/pax/Makefile
@@ -0,0 +1,10 @@
+distctan:
+	cd .. && mkdir pax
+	cd .. && rsync -rL `pwd`/* --exclude '.git/' --exclude 'build/' --exclude '*.zip' -L pax/
+	cd ../pax/source && ant distctan
+	rm -rf ../pax/source/build
+	rm -rf ../pax/pax
+	cd .. && zip -r pax-`date +"%Y%m%d"`.zip pax/
+	
+clean:
+	cd .. && rm -rf pax
diff --git a/Master/texmf-dist/source/latex/pax/build.xml b/Master/texmf-dist/source/latex/pax/build.xml
index 230cd3e59d6..0a7eae3ddfc 100644
--- a/Master/texmf-dist/source/latex/pax/build.xml
+++ b/Master/texmf-dist/source/latex/pax/build.xml
@@ -6,44 +6,82 @@
 
   <property name="src"   location="src"/>
   <property name="build" location="build"/>
-  <property name="dist"  location="."/>
+  <property name="dist"  location="../scripts/"/>
   <property name="pdfbox.home" location="${basedir}"/> <!-- or somewhere else -->
-  <property name="pdfbox.name" value="PDFBox-0.7.2.jar"/>
 
   <target name="init">
     <mkdir dir="${build}"/>
   </target>
 
   <target name="compile"
-          depends="init"
-          description="compile the source"
-  >
-    <javac srcdir="${src}" destdir="${build}" target="1.4" source="1.4">
+	  depends="init"
+	  description="compile the source"
+	  >
+    <javac srcdir="${src}" destdir="${build}">
       <classpath>
-        <!-- try with and without subdirectory `lib' -->
-        <pathelement location="${pdfbox.home}/lib/${pdfbox.name}"/>
-        <pathelement location="${pdfbox.home}/${pdfbox.name}"/>
+	<pathelement location="${basedir}/lib/pdfbox.jar"/>
+	<pathelement location="${basedir}/lib/commons-logging.jar"/>
       </classpath>
     </javac>
   </target>
 
+  <path id="build.classpath">
+    <fileset dir="${basedir}">
+      <include name="lib/*.jar"/>
+    </fileset>
+  </path>
+
+  <pathconvert property="manifest.classpath" pathsep=" ">
+    <path refid="build.classpath"/>
+    <mapper>
+      <chainedmapper>
+	<flattenmapper/>
+	<globmapper from="*.jar" to="lib/*.jar"/>
+      </chainedmapper>
+    </mapper>
+  </pathconvert>
+
+  <target name="distctan"
+	  depends="compile"
+	  description="generate the distribution ctan"
+	  >
+    <mkdir dir="${dist}"/>
+    <jar jarfile="${dist}/${ant.project.name}.jar"
+	 manifest="${src}/MANIFEST.MF"
+	 basedir="${build}"
+	 includes="pax/**" >
+    <zipgroupfileset dir="lib" includes="*.jar"/>
+    </jar>
+  </target>
+  
   <target name="dist"
-          depends="compile"
-          description="generate the distribution"
-  >
+	  depends="compile"
+	  description="generate the distribution"
+	  >
     <mkdir dir="${dist}"/>
+    <mkdir dir="${dist}/lib"/>
+    <copy todir="${dist}/lib" flatten="true">
+      <fileset dir="lib">
+	<include name="*.jar" />
+      </fileset>
+    </copy>
     <jar jarfile="${dist}/${ant.project.name}.jar"
-         manifest="${src}/MANIFEST.MF"
-         basedir="${build}"
-         includes="pax/**"
-    />
+	 manifest="${src}/MANIFEST.MF"
+	 basedir="${build}"
+	 includes="pax/**" >
+      <manifest>
+	<attribute name="Class-Path" value="${manifest.classpath}" />
+      </manifest>
+    </jar>
   </target>
 
+
   <target name="clean"
-          description="clean up"
-  >
+	  description="clean up"
+	  >
     <delete dir="${build}"/>
-    <delete file="${dist}/${ant.project.name}.jar"/>
+    <delete dir="${dist}/lib"/>
+    <delete file="${dist}/pax.jar" />
   </target>
 
 </project>
diff --git a/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar b/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
new file mode 100644
index 00000000000..a9c6522d91c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
diff --git a/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar b/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar
new file mode 100644
index 00000000000..b49ce4e1813
--- /dev/null
+++ b/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar
diff --git a/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java b/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
index 868dadaa80c..d1350574679 100644
--- a/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
+++ b/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
@@ -24,14 +24,14 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 
-import org.pdfbox.cos.*;
-import org.pdfbox.pdfparser.*;
-import org.pdfbox.pdmodel.*;
-import org.pdfbox.pdmodel.common.*;
-import org.pdfbox.pdmodel.interactive.action.*;
-import org.pdfbox.pdmodel.interactive.action.type.*;
-import org.pdfbox.pdmodel.interactive.annotation.*;
-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+import org.apache.pdfbox.cos.*;
+import org.apache.pdfbox.pdfparser.*;
+import org.apache.pdfbox.pdmodel.*;
+import org.apache.pdfbox.pdmodel.common.*;
+import org.apache.pdfbox.pdmodel.interactive.action.*;
+import org.apache.pdfbox.pdmodel.interactive.action.type.*;
+import org.apache.pdfbox.pdmodel.interactive.annotation.*;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
 
 public class PDFAnnotExtractor implements Constants {
 
diff --git a/Master/texmf-dist/source/latex/pax/src/StringVisitor.java b/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
index 485757e36fa..1460ade25c2 100644
--- a/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
+++ b/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
@@ -22,8 +22,8 @@ package pax;
 
 import java.io.*;
 import java.util.*;
-import org.pdfbox.cos.*;
-import org.pdfbox.exceptions.*;
+import org.apache.pdfbox.cos.*;
+import org.apache.pdfbox.exceptions.*;
 
 public class StringVisitor implements ICOSVisitor {