Skip to content

Fix build #141

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
derMart wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix build #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9b154e
Update build files and documentation.
derMart Mar 23, 2020
4562f04
fix merge conflict
derMart Mar 23, 2020
b522803
remove eclipse related targets from ant/build-jar.xml
derMart Mar 23, 2020
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/config.properties
/bin
/setup_new.nsi
/.metadata
/.metadata
/Deploy
32 changes: 7 additions & 25 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,24 @@

## Requirements

Download [Java SE Runtime Environment](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html)
for Linux x86 and Linux x64 platform in ".tar.gz" format.

```
cd ./jre
wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-i586.tar.gz
tar xf jre-8u101-linux-i586.tar.gz
mv jre1.8.0_101 linjre32
wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-x64.tar.gz
tar xf jre-8u101-linux-x64.tar.gz
mv jre1.8.0_101 linjre64
tar cf linjre.tar linjre32 linjre64
cd ..
```

Install p7zip:

```ShellSession
apt-get install p7zip
```

Add bin folder:
Java JDK installed as well as ant.
It should work with the openjdk and ant packages from ubuntu.

```ShellSession
mkdir ./bin
sudo apt install openjdk-11-jdk
sudo apt install ant
```

## Build

```ShellSession
ant -buildfile ant/build-jar.xml
ant -buildfile ant/deploy-release.xml
ant -buildfile ant/setup-linux.xml binaries
ant -buildfile ant/setup-release.xml
```

Now you can run newly released FlashTool from `Deploy/FlashTool`:

```ShellSession
./../Deploy/FlashTool/FlashTool
./Deploy/FlashTool/FlashTool
```
110 changes: 110 additions & 0 deletions ant/build-jar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project basedir="../" default="build" name="Flashtool">
<property environment="env"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="11"/>
<property name="source" value="11"/>
<path id="Flashtool.classpath">
<pathelement location="bin"/>
<pathelement location="libs/javax.annotation_1.2.0.jar"/>
<pathelement location="libs/javax.inject_1.0.0.jar"/>
<pathelement location="libs/ini4j-0.5.4.jar"/>
<pathelement location="libs/commons-io-2.6.jar"/>
<pathelement location="libs/jsr305-3.0.2.jar"/>
<pathelement location="libs/xstream-1.4.11.1.jar"/>
<pathelement location="libs/jsch-0.1.55.jar"/>
<pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
<pathelement location="libs/icu4j-64.2.jar"/>
<pathelement location="libs/jarchivelib-1.0.0.jar"/>
<pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
<pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
<pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
<pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
<pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
<pathelement location="libs/jna-5.5.0.jar"/>
<pathelement location="libs/jna-platform-5.5.0.jar"/>
<pathelement location="libs/jdom2-2.0.6.jar"/>
<pathelement location="libs/guava-28.2-jre.jar"/>
<pathelement location="libs/lz4-java-1.7.1.jar"/>
<pathelement location="libs/apk-parser-2.6.10.jar"/>
<pathelement location="libs/bcpg-jdk15on-1.64.jar"/>
<pathelement location="libs/bcpkix-jdk15on-1.64.jar"/>
<pathelement location="libs/bcprov-jdk15on-1.64.jar"/>
<pathelement location="libs/eclipse/org.eclipse.core.jobs_3.10.700.v20200106-1020.jar"/>
<pathelement location="libs/eclipse/org.eclipse.core.commands_3.9.700.v20191217-1850.jar"/>
<pathelement location="libs/eclipse/org.eclipse.equinox.app_1.4.400.v20191212-0743.jar"/>
<pathelement location="libs/eclipse/org.eclipse.equinox.preferences_3.7.700.v20191213-1901.jar"/>
<pathelement location="libs/jbbp-2.0.1.jar"/>
<pathelement location="libs/commons-compress-1.20.jar"/>
<pathelement location="libs/javax.activation-1.2.1-20181010.205421-2_modular.jar"/>
<pathelement location="libs/jaxb-api-2.4.0-b180830.0359.jar"/>
<pathelement location="libs/delight-nashorn-sandbox-0.1.28.jar"/>
<pathelement location="libs/js-beautify-1.9.0.jar"/>
<pathelement location="libs/eclipse/org.eclipse.core.contenttype_3.7.600.v20200124-1609.jar"/>
<pathelement location="libs/eclipse/org.eclipse.core.runtime_3.17.100.v20200203-0917.jar"/>
<pathelement location="libs/eclipse/org.eclipse.equinox.common_3.11.0.v20200206-0817.jar"/>
<pathelement location="libs/eclipse/org.eclipse.equinox.registry_3.8.700.v20200121-1457.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jface_3.19.0.v20200218-1607.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jface.text_3.16.200.v20200218-0828.jar"/>
<pathelement location="libs/eclipse/org.eclipse.osgi_3.15.200.v20200214-1600.jar"/>
<pathelement location="libs/eclipse/org.eclipse.text_3.10.100.v20200217-1239.jar"/>
<pathelement location="libs/eclipse/org.eclipse.ui.forms_3.9.0.v20200213-1442.jar"/>
<pathelement location="libs/log4j-api-2.13.1.jar"/>
<pathelement location="libs/log4j-core-2.13.1.jar"/>
<pathelement location="libs/log4j-slf4j18-impl-2.13.1.jar"/>
<pathelement location="libs/win/x86_64/org.eclipse.swt.win32.win32.x86_64_3.114.0.v20200304-0601.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jgit_5.7.0.202003110725-r.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jgit.archive_5.7.0.202003110725-r.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jgit.http.apache_5.7.0.202003110725-r.jar"/>
<pathelement location="libs/eclipse/org.eclipse.jgit.ssh.apache_5.7.0.202003110725-r.jar"/>
<pathelement location="libs/eclipse/org.eclipse.swt_3.114.0.v20200304-0601.jar"/>
<pathelement location="libs/eclipse/org.eclipse.ui.workbench_3.118.0.v20200222-0719.jar"/>
</path>
<path id="run.Main.classpath">
<path refid="Flashtool.classpath"/>
<pathelement location="libs/javax.annotation_1.2.0.jar"/>
<pathelement location="libs/javax.inject_1.0.0.jar"/>
<pathelement location="libs/ini4j-0.5.4.jar"/>
<pathelement location="libs/commons-io-2.6.jar"/>
<pathelement location="libs/jsr305-3.0.2.jar"/>
<pathelement location="libs/xstream-1.4.11.1.jar"/>
<pathelement location="libs/jsch-0.1.55.jar"/>
<pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
<pathelement location="libs/icu4j-64.2.jar"/>
<pathelement location="libs/jarchivelib-1.0.0.jar"/>
<pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
<pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
<pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
<pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
<pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
<pathelement location="libs/jna-5.5.0.jar"/>
<pathelement location="libs/jna-platform-5.5.0.jar"/>
<pathelement location="libs/jdom2-2.0.6.jar"/>
</path>
<target name="init">
<mkdir dir="bin"/>
<copy includeemptydirs="false" todir="bin">
<fileset dir="src">
<exclude name="**/*.java"/>
</fileset>
</copy>
</target>
<target name="clean">
<delete dir="bin"/>
</target>
<target depends="clean" name="cleanall"/>
<target depends="build-subprojects,build-project" name="build"/>
<target name="build-subprojects"/>
<target depends="init" name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
<src path="src"/>
<classpath refid="Flashtool.classpath"/>
</javac>
</target>
<target name="Main">
<java classname="gui.Main" failonerror="true" fork="yes">
<classpath refid="run.Main.classpath"/>
</java>
</target>
</project>
68 changes: 34 additions & 34 deletions ant/deploy-beta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="all" name="Deploy Flashtool Beta">

<property name="version" value="0.9.18.1"/>
<property name="progtime" value="08-25-2014 23:00:00"/>

<target name="all" depends="core release"/>


<target name="clean">
<mkdir dir="../../Deploy"/>
<delete dir="../../Deploy/FlashTool"/>
<mkdir dir="../Deploy"/>
<delete dir="../Deploy/FlashTool"/>
</target>

<target name="clone">
<git-clone uri="https://github.com/Androxyde/devices.git" dest="../../Deploy/FlashTool/devices" />
</target>
<git-clone uri="https://github.com/Androxyde/devices.git" dest="../Deploy/FlashTool/devices" />
</target>

<target name="ressources">
<jar destfile="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
<jar destfile="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
<manifest>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Date" value="${progtime}"/>
Expand All @@ -30,58 +30,58 @@
</target>

<target name="core release" depends="clean,ressources">
<mkdir dir ="../../Deploy/FlashTool"/>
<mkdir dir ="../../Deploy/FlashTool/custom/"/>
<mkdir dir ="../../Deploy/FlashTool/custom/root"/>
<mkdir dir ="../../Deploy/FlashTool/custom/shells"/>
<mkdir dir ="../../Deploy/FlashTool/custom/features"/>
<mkdir dir ="../../Deploy/FlashTool/custom/sin"/>
<mkdir dir ="../../Deploy/FlashTool/custom/mydevices"/>
<mkdir dir ="../../Deploy/FlashTool/firmwares"/>
<mkdir dir="../../Deploy/FlashTool/x10flasher_lib"/>
<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
<mkdir dir="../../Deploy/FlashTool/drivers"/>
<copy todir="../../Deploy/FlashTool/custom/shells">
<mkdir dir ="../Deploy/FlashTool"/>
<mkdir dir ="../Deploy/FlashTool/custom/"/>
<mkdir dir ="../Deploy/FlashTool/custom/root"/>
<mkdir dir ="../Deploy/FlashTool/custom/shells"/>
<mkdir dir ="../Deploy/FlashTool/custom/features"/>
<mkdir dir ="../Deploy/FlashTool/custom/sin"/>
<mkdir dir ="../Deploy/FlashTool/custom/mydevices"/>
<mkdir dir ="../Deploy/FlashTool/firmwares"/>
<mkdir dir="../Deploy/FlashTool/x10flasher_lib"/>
<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
<mkdir dir="../Deploy/FlashTool/drivers"/>
<copy todir="../Deploy/FlashTool/custom/shells">
<fileset dir="../shells"
excludes="**/.svn"/>
</copy>
<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
<fileset dir="../src/org/lang/ressources"
excludes="**/.svn"/>
</copy>
<copy todir="../../Deploy/FlashTool/firmwares">
<copy todir="../Deploy/FlashTool/firmwares">
<fileset dir="../firmwares"
excludes="**/.svn"/>
</copy>
<copy todir="../../Deploy/FlashTool/custom/root">
<copy todir="../Deploy/FlashTool/custom/root">
<fileset dir="../romupdates" excludes="**/.svn"/>
</copy>
<copy todir="../../Deploy/FlashTool/x10flasher_lib">
<copy todir="../Deploy/FlashTool/x10flasher_lib">
<fileset dir="../libs" excludes="**/.svn"/>
</copy>
<chmod file="../../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
<chmod file="../../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
<chmod file="../../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
<chmod file="../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
<chmod file="../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
<chmod file="../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
</target>

<target name="Shells only">
<delete dir="../../Deploy/FlashTool/custom/shells"/>
<mkdir dir="../../Deploy/FlashTool/custom/shells"/>
<copy todir="../../Deploy/FlashTool/custom/shells">
<delete dir="../Deploy/FlashTool/custom/shells"/>
<mkdir dir="../Deploy/FlashTool/custom/shells"/>
<copy todir="../Deploy/FlashTool/custom/shells">
<fileset dir="../shells"
excludes="**/.svn"/>
</copy>
</target>

<target name="Langs only">
<delete dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
<delete dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
<fileset dir="../src/org/lang/ressources"
excludes="**/.svn"/>
</copy>
</target>

<taskdef resource="org/eclipse/jgit/ant/ant-tasks.properties">
<classpath>
<pathelement location="../libs/jgit.jar"/>
Expand Down
Loading