From 806ab5532e0e735fd8eb2fded2ead97de8133df0 Mon Sep 17 00:00:00 2001 From: tobias <tobias.ullerich@icloud.com> Date: Sat, 9 Jul 2016 11:44:49 +0200 Subject: [PATCH] Add beta build script and update stable build script --- PlayWall/beta.xml | 53 ++++++++++++++++++++++++++++ PlayWall/build.xml | 88 ++++++++++++++++++++++++++++++---------------- 2 files changed, 111 insertions(+), 30 deletions(-) create mode 100644 PlayWall/beta.xml diff --git a/PlayWall/beta.xml b/PlayWall/beta.xml new file mode 100644 index 00000000..868e16cb --- /dev/null +++ b/PlayWall/beta.xml @@ -0,0 +1,53 @@ +<project name="Build App" default="buildApp" basedir="/Users/tobias/Documents/Programmieren/Java/eclipse/"> + + <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/appbundler-1.0.jar" /> + <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/launch4j/launch4j.jar:${launch4j.dir}/lib/xstream.jar" /> + <taskdef name="upload" classname="de.tobias.playwallpm.task.PlayWallPMTask" classpath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPackageManager/build/PlayWallPM.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/jsch/jsch-0.1.53.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/YAMLStorage.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/snakeyaml-1.11.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/guava-15.0.jar" /> + <taskdef name="buildNumber" classname="de.tobias.playwallpm.task.BuildNumberTask" classpath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPackageManager/build/PlayWallPM.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/jsch/jsch-0.1.53.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/YAMLStorage.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/snakeyaml-1.11.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/guava-15.0.jar" /> + + <target name="buildApp"> + + <!-- Update Version Number --> + <buildNumber path="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/application.yml" /> + <buildNumber path="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin/application.yml" /> + + <!-- Build Jar --> + <jar destfile="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar"> + <manifest> + <attribute name="Main-Class" value="de.tobias.playpad.PlayPadMain" /> + </manifest> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.class" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.png" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.yml" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.fxml" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.css" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.properties" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWallCore/bin" includes="**/*.class" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/libs/libUtils/bin" includes="**/*.class" /> + + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/JavaFX/controlsfx-8/" includes="controlsfx-8.40.10.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/XML/" includes="dom4j-1.6.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="guava-15.0.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="snakeyaml-1.11.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="YAMLStorage.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/HTML/" includes="gagawa-1.0.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/jspf/dist/" includes="jspf.core-1.0.2.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/tinysound/" includes="tinysound-1.1.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/tinysound/lib/" includes="**/*.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/JLayer1.0.1/" includes="jl1.0.1.jar" /> + </jar> + + <!-- Upload Jar --> + <input addproperty="password">Enter password</input> + + <upload username="p35947554-pw" password="${password}" host="p35947554.1and1-data.host" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" remotePath="beta" remoteFileName="PlayWall.jar"/> + </target> +</project> \ No newline at end of file diff --git a/PlayWall/build.xml b/PlayWall/build.xml index e8324556..9de34d18 100644 --- a/PlayWall/build.xml +++ b/PlayWall/build.xml @@ -1,32 +1,60 @@ <project name="Build App" default="buildApp" basedir="/Users/tobias/Documents/Programmieren/Java/eclipse/"> - - <taskdef name="bundleapp" - classname="com.oracle.appbundler.AppBundlerTask" - classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/appbundler-1.0.jar" /> - - <taskdef name="launch4j" - classname="net.sf.launch4j.ant.Launch4jTask" - classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/launch4j/launch4j.jar:${launch4j.dir}/lib/xstream.jar" /> - - <target name="buildApp"> - <bundleapp outputdirectory="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/dist" - name="Play Wall" - displayname="Play Wall" - identifier="de.tobias.playwall" - mainclassname="de.tobias.playpad.PlayPadMain" - icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.icns"> - <runtime dir="/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home" /> - <classpath file="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" /> - </bundleapp> - - <launch4j> - <config headerType="gui" outfile="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/dist/PlayWall.exe" - dontWrapJar="false" jarPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" - icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.ico" > - <classPath mainClass="de.tobias.playpad.PlayPadMain" /> - <jre minVersion="1.8.0"> - </jre> - </config> - </launch4j> - </target> + + <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/appbundler-1.0.jar" /> + <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/launch4j/launch4j.jar:${launch4j.dir}/lib/xstream.jar" /> + <taskdef name="upload" classname="de.tobias.playwallpm.task.PlayWallPMTask" classpath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPackageManager/build/PlayWallPM.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/jsch/jsch-0.1.53.jar" /> + <taskdef name="buildNumber" classname="de.tobias.playwallpm.task.BuildNumberTask" classpath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPackageManager/build/PlayWallPM.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/jsch/jsch-0.1.53.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/YAMLStorage.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/snakeyaml-1.11.jar: + /Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/guava-15.0.jar" /> + + <target name="buildApp"> + + <!-- Update Version Number --> + + <jar destfile="PlayWall/build/PlayWall.jar"> + <manifest> + <attribute name="Main-Class" value="de.tobias.playpad.PlayPadMain" /> + </manifest> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.class" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.png" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.yml" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.fxml" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.css" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/bin" includes="**/*.properties" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWallCore/bin" includes="**/*.class" /> + <fileset dir="/Users/tobias/Documents/Programmieren/Java/git/libs/libUtils/bin" includes="**/*.class" /> + + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/JavaFX/controlsfx-8/" includes="controlsfx-8.40.10.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/XML/" includes="dom4j-1.6.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="guava-15.0.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="snakeyaml-1.11.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/YAML/" includes="YAMLStorage.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/File Parser/HTML/" includes="gagawa-1.0.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/jspf/dist/" includes="jspf.core-1.0.2.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/tinysound/" includes="tinysound-1.1.1.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/tinysound/lib/" includes="**/*.jar" /> + <zipgroupfileset dir="/Users/tobias/Documents/Programmieren/Java/Libraries/JLayer1.0.1/" includes="jl1.0.1.jar" /> + </jar> + + <bundleapp outputdirectory="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/dist" name="Play Wall" displayname="Play Wall" identifier="de.tobias.playwall" mainclassname="de.tobias.playpad.PlayPadMain" icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.icns"> + <runtime dir="/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home" /> + <classpath file="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" /> + </bundleapp> + + <launch4j> + <config headerType="gui" outfile="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/dist/PlayWall.exe" dontWrapJar="false" jarPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.ico"> + <classPath mainClass="de.tobias.playpad.PlayPadMain" /> + <jre minVersion="1.8.0"> + </jre> + </config> + </launch4j> + + <input addproperty="password">Enter password</input> + + <upload username="p35947554-pw" password="${password}" host="p35947554.1and1-data.host" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" remotePath="beta" remoteFileName="PlayWall.jar" /> + <upload username="p35947554-pw" password="${password}" host="p35947554.1and1-data.host" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.exe" remotePath="beta" remoteFileName="PlayWall.exe" /> + </target> </project> \ No newline at end of file -- GitLab