-
Notifications
You must be signed in to change notification settings - Fork 253
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git://github.com/jdgiotta/jave2 into jdgiott…
…a-master # Conflicts: # build.xml
- Loading branch information
Showing
3 changed files
with
1,592 additions
and
1,590 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,134 +1,134 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- You may freely edit this file. See commented blocks below for --> | ||
| <!-- some examples of how to customize the build. --> | ||
| <!-- (If you delete it and reopen the project it will be recreated.) --> | ||
| <!-- By default, only the Clean and Build commands use this build script. --> | ||
| <!-- Commands such as Run, Debug, and Test only use this build script if --> | ||
| <!-- the Compile on Save feature is turned off for the project. --> | ||
| <!-- You can turn off the Compile on Save (or Deploy on Save) setting --> | ||
| <!-- in the project's Project Properties dialog box.--> | ||
| <project name="Jave2.2" default="build-all-jars" basedir="."> | ||
| <description>Builds, tests, and runs the project Jave 2.2.</description> | ||
| <property name="lib.dir" value="libs"/> | ||
|
|
||
| <property name="Version" value="2.2"/> | ||
| <property name="JavaVersion" value="1.7"/> | ||
| <path id="classpath"> | ||
| <fileset dir="${lib.dir}" includes="**/*.jar"/> | ||
| </path> | ||
|
|
||
| <target name="clean"> | ||
| <delete dir="build" /> | ||
| </target> | ||
|
|
||
| <target name="compile" depends="clean"> | ||
| <mkdir dir="build/classes" /> | ||
| <copy todir="build/classes/it/sauronsoftware/jave/native"> | ||
| <fileset dir="src/it/sauronsoftware/jave/native" /> | ||
| </copy> | ||
| <javac target="${JavaVersion}" source="${JavaVersion}" srcdir="src" destdir="build/classes" classpathref="classpath"/> | ||
| </target> | ||
|
|
||
| <target name="build-all-jars" | ||
| depends="build-jar,build-jar-win32,build-jar-win64,build-jar-linux32,build-jar-linux64,build-src-jar"> | ||
| <mkdir dir="dist"/> | ||
| </target> | ||
|
|
||
| <target name="build-jar" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <!--<delete file="dist/jave-${Version}.jar" quiet="true"/>--> | ||
| <jar destfile="dist/jave-${Version}.jar" basedir="build/classes" | ||
| excludes="it/sauronsoftware/jave/native/**" > | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-win32" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-win32.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-i386.exe"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-win64" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-win64.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-amd64.exe"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
|
|
||
| <target name="build-jar-linux32" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-linux32.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-i386"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-linux64" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-linux64.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-amd64"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-src-jar"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-src.jar" basedir="src" | ||
| excludes="it/sauronsoftware/jave/native/**"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave 2"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- You may freely edit this file. See commented blocks below for --> | ||
| <!-- some examples of how to customize the build. --> | ||
| <!-- (If you delete it and reopen the project it will be recreated.) --> | ||
| <!-- By default, only the Clean and Build commands use this build script. --> | ||
| <!-- Commands such as Run, Debug, and Test only use this build script if --> | ||
| <!-- the Compile on Save feature is turned off for the project. --> | ||
| <!-- You can turn off the Compile on Save (or Deploy on Save) setting --> | ||
| <!-- in the project's Project Properties dialog box.--> | ||
| <project name="Jave" default="build-all-jars" basedir="."> | ||
| <description>Builds, tests, and runs the project Jave.</description> | ||
| <property name="lib.dir" value="libs"/> | ||
|
|
||
| <property name="Version" value="2.2"/> | ||
| <property name="JavaVersion" value="1.7"/> | ||
| <path id="classpath"> | ||
| <fileset dir="${lib.dir}" includes="**/*.jar"/> | ||
| </path> | ||
|
|
||
| <target name="clean"> | ||
| <delete dir="build" /> | ||
| </target> | ||
|
|
||
| <target name="compile" depends="clean"> | ||
| <mkdir dir="build/classes" /> | ||
| <copy todir="build/classes/it/sauronsoftware/jave/native"> | ||
| <fileset dir="src/it/sauronsoftware/jave/native" /> | ||
| </copy> | ||
| <javac target="${JavaVersion}" source="${JavaVersion}" srcdir="src" destdir="build/classes" classpathref="classpath"/> | ||
| </target> | ||
|
|
||
| <target name="build-all-jars" | ||
| depends="build-jar,build-jar-win32,build-jar-win64,build-jar-linux32,build-jar-linux64,build-src-jar"> | ||
| <mkdir dir="dist"/> | ||
| </target> | ||
|
|
||
| <target name="build-jar" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <!--<delete file="dist/jave-${Version}.jar" quiet="true"/>--> | ||
| <jar destfile="dist/jave-${Version}.jar" basedir="build/classes" | ||
| excludes="it/sauronsoftware/jave/native/**" > | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-win32" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-win32.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-i386.exe"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-win64" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-win64.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-amd64.exe"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
|
|
||
| <target name="build-jar-linux32" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-linux32.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-i386"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-jar-linux64" depends="compile"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-linux64.jar" basedir="build/classes" | ||
| includes="it/sauronsoftware/jave/native/ffmpeg-amd64"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave ${Version}"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
|
|
||
| <target name="build-src-jar"> | ||
| <mkdir dir="dist"/> | ||
| <jar destfile="dist/jave-${Version}-src.jar" basedir="src" | ||
| excludes="it/sauronsoftware/jave/native/**"> | ||
| <manifest> | ||
| <!-- Who is building this jar? --> | ||
| <attribute name="Built-By" value="${user.name}"/> | ||
| <!-- Information about the program itself --> | ||
| <attribute name="Implementation-Vendor" value="Aarboard AG"/> | ||
| <attribute name="Implementation-Title" value="Jave 2"/> | ||
| <attribute name="Implementation-Version" value="${Version}"/> | ||
| <!-- details --> | ||
| </manifest> | ||
| </jar> | ||
| </target> | ||
| </project> |
Oops, something went wrong.