Skip to content

Adding Travis CI script, etc. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adding Travis CI script, etc. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90bea57
Changing launch4j path from non-relative to relative
john-peterson Jun 25, 2013
0a478ed
Changing the Core.jar entry point
john-peterson Jun 27, 2013
ed67e35
Removing unused projects from build script
john-peterson Jun 27, 2013
95651dd
Removing dev/JDownloader.jar
john-peterson Jun 27, 2013
6e35619
Adding Travis CI script
john-peterson Jun 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
language:
- java

jdk:
- openjdk7

install:
- sudo apt-get -qq update

- sudo apt-get -qq install eclipse-platform
- unzip /usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.dist.jar jdtCompilerAdapter.jar

- wget http://sourceforge.net/projects/launch4j/files/launch4j-3/3.1.0-beta1/launch4j-3.1.0-beta1-linux.tgz/download -O launch4j-3.1.0-beta1-linux.tgz && tar xfv launch4j*.tgz
- sudo apt-get -qq install binutils-mingw-w64-i686
- cp -v /usr/bin/i686*windres launch4j/bin/windres; cp -v /usr/bin/i686*ld launch4j/bin/ld

- svn co svn://svn.appwork.org/updclient/v2 ../UpdateClientV2
- svn co svn://svn.appwork.org/utils ../AppWorkUtils
- svn co svn://svn.jdownloader.org/jdownloader/MyJDownloaderClient ../MyJDownloaderClient
- svn co svn://svn.jdownloader.org/jdownloader/browser ../JDBrowser

script:
- launch4j/launch4j `pwd`/build/launch4j.xml
- ant -Dbasedir=. -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter -lib jdtCompilerAdapter.jar -lib /usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.dist.jar -f build/newBuild/build.xml withoutsign
4 changes: 2 additions & 2 deletions build/launch4j.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<jar>JDownloader.jar</jar>
<outfile>C:\workspace\JDownloader\ressourcen\JDownloader.exe</outfile>
<outfile>../ressourcen/JDownloader.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir></chdir>
Expand All @@ -12,7 +12,7 @@
<customProcName>false</customProcName>
<stayAlive>false</stayAlive>
<manifest></manifest>
<icon>C:\workspace\JDownloader\artwork\icons\by TRazo\jdicon.ico</icon>
<icon>../artwork/icons/by TRazo/jdicon.ico</icon>
<jre>
<path>jre/</path>
<minVersion>1.6.0</minVersion>
Expand Down
24 changes: 1 addition & 23 deletions build/newBuild/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<project default="all" basedir=".">
<!-- Dependencies -->
<property name="dep.awu" value="../AppWorkUtils" />
<property name="dep.serveroptions" value="../JDownloaderServerOptions" />
<property name="dep.browser" value="../JDBrowser" />
<property name="dep.updateclient" value="../UpdateClientV2" />
<property name="dep.jdupdateclient" value="../JDownloaderUpdater" />
<property name="dep.myjd" value="../MyJDownloaderClient" />
<property name="debug" value="true" />

Expand Down Expand Up @@ -71,10 +69,6 @@
<javac srcdir="src" debug="${debug}" excludes="jd/utils/dev/*,org/jdownloader/extensions/langfileeditor/**/*,org/jdownloader/extensions/neembuu/**/*,org/jdownloader/extensions/remoteserv/**/*" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
<classpath refid="classpath" />

</javac>
<javac srcdir="${dep.jdupdateclient}/src" excludes="" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
<classpath refid="classpath" />

</javac>
<echo message="Finished." />
</target>
Expand Down Expand Up @@ -110,12 +104,6 @@
<copy todir="${dist}/tools">
<fileset dir="${res}/tools" includes="**/*" />
</copy>
<copy todir="${dist}" overwrite="true">
<fileset dir="${dep.serveroptions}">
<include name="**/*.serverOptions" />
<include name="**/*.clientOptions" />
</fileset>
</copy>
<copy todir="${dist}">
<fileset dir="${res}" includes="*.txt, *.exe, *.bat, *.properties" />
</copy>
Expand Down Expand Up @@ -230,7 +218,7 @@
<echo message="ClassPath ${class-path} ${class-path-extensions}" />
<manifest file="${dist}/Manifest.MF">
<attribute name="Created-By" value="JD-Team and AppWork GmbH" />
<attribute name="Main-Class" value="jd.Main" />
<attribute name="Main-Class" value="org.jdownloader.startup.Main" />
<!-- plugins that serialize own classes have to be put in the classpath -->
<attribute name="Class-Path" value="JDownloader.jar ${class-path} ${class-path-extensions}" />

Expand Down Expand Up @@ -332,10 +320,6 @@
<exclude name="org/appwork/update/server/**/*" />
</fileset>

<fileset dir="${dep.jdupdateclient}/src">
<include name="cfg/**/*" />

</fileset>


<fileset dir="themes">
Expand Down Expand Up @@ -458,12 +442,6 @@
</fileset>
</copy>

<copy todir="${update_2}" overwrite="true">
<fileset dir="${dep.serveroptions}">
<include name="**/*.serverOptions" />
<include name="**/*.clientOptions" />
</fileset>
</copy>
</target>


Expand Down
Binary file removed dev/JDownloader.jar
View file
Open in desktop
Binary file not shown.