summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/struts-core/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/struts-core/files')
-rw-r--r--dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch20
-rw-r--r--dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch15
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch
new file mode 100644
index 000000000000..1ce5974427b7
--- /dev/null
+++ b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch
@@ -0,0 +1,20 @@
+--- a/maven-build.xml
++++ b/maven-build.xml
+@@ -125,7 +125,7 @@
+
+ <target name="compile" depends="get-deps" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+- <javac destdir="${maven.build.outputDir}"
++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+@@ -153,7 +153,7 @@
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+- <javac destdir="${maven.build.testOutputDir}"
++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch
new file mode 100644
index 000000000000..001b5fdb4630
--- /dev/null
+++ b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch
@@ -0,0 +1,15 @@
+--- a/core/maven-build.xml
++++ b/core/maven-build.xml
+@@ -271,12 +271,8 @@
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/core/target/classes/META-INF/MANIFEST.MF"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html">
+- <manifest>
+- <attribute name="Main-Class"/>
+- </manifest>
+ </jar>
+ </target>
+