Skip to content

Commit

Permalink
Update master to 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pquiring
pquiring committed Aug 28, 2015
2 parents 8deaac3 + 73cd243 commit aac3903
Show file tree
Hide file tree
Showing 7 changed files with 3,468 additions and 3,425 deletions.
314 changes: 157 additions & 157 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,157 +1,157 @@
<project name="javaforce" default="jar" basedir=".">
<description>JavaForce SDK</description>
<!-- set global properties for this build -->
<property name="app" location="javaforce"/>
<property name="src" location="src"/>
<property name="build" location="classes"/>
<property name="home" value="."/>
<property name="version" value="10.0.0"/>

<import file="base.xml"/>

<available property="have_bouncycastle" file="jars/bouncycastle.jar"/>
<target name="bouncycastle" unless="have_bouncycastle" description="download bouncycastle">
<get src="http://pquiring.github.io/javaforce/jars/bouncycastle.jar" dest="jars"/>
</target>

<available property="have_derby" file="jars/derby.jar"/>
<target name="derby" unless="have_derby" description="download derby">
<get src="http://pquiring.github.io/javaforce/jars/derby.jar" dest="jars"/>
</target>

<!-- not in use yet -->
<available property="have_android" file="jars/android.jar"/>
<target name="android" unless="have_android" description="download android">
<get src="http://pquiring.github.io/javaforce/jars/android.jar" dest="jars"/>
</target>

<available property="have_glfw" file="native/glfw/src/window.c"/>
<target name="glfw" unless="have_glfw" description="download glfw">
<exec command="git clone https://github.com/glfw/glfw.git native/glfw"/>
</target>

<target name="depjars" depends="depnatives,bouncycastle,derby,glfw">
</target>

<target name="compile" depends="depjars" description="compile the source">
<!-- Compile the java code from ${src} into ${build} -->
<mkdir dir="${build}"/>
<mkdir dir="jars"/>
<javac srcdir="${src}" destdir="${build}" target="1.6" source="1.6" debug="true" includeantruntime="false">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
<fileset dir="jars" includes="*.jar"/>
</classpath>
</javac>
</target>

<target name="jar" depends="depjars,compile" description="build jar file">
<!-- Build jar file from class files -->
<jar destfile="jars/javaforce.jar" includes="**/*.class" basedir="${build}">
</jar>
</target>

<target name="release-bin" depends="jar" description="create release zip file">
<zip destfile="javaforce-bin-${version}.zip">
<fileset dir=".">
<include name="jars/javaforce.jar"/>
<include name="native/*.dll"/>
<include name="native/*.so"/>
<include name="native/*.dylib"/> <!-- not available yet -->
<include name="stubs/*.exe"/>
<include name="stubs/*.bin"/>
</fileset>
</zip>
<move file="javaforce-bin-${version}.zip" todir="${home}/release"/>
</target>

<target name="get-bin" description="download bin zip file">
<get src="http://github.com/pquiring/javaforce/releases/download/${version}/javaforce-bin-${version}.zip" dest="."/>
<unzip src="javaforce-bin-${version}.zip" dest="."/>
</target>

<target name="javadoc" description="generate java documentation">
<javadoc sourcepath="src" destdir="javadoc">
<classpath>
<fileset dir="jars" includes="*.jar"/>
</classpath>
</javadoc>
</target>

<!-- sudo ant install -->
<target name="install" description="install files">
<copy file="jars/javaforce.jar" todir="/usr/share/java"/>
<copy file="jars/bouncycastle.jar" todir="/usr/share/java"/>
<copy file="jars/filters.jar" todir="/usr/share/java"/>

<copy file="native/jfnative${bits}.so" todir="/usr/lib"/>

<copy file="lnxbin/jbus-call" todir="/usr/bin"/>
<chmod file="/usr/bin/jbus-call" perm="+x"/>
<copy file="lnxbin/jbus-client" todir="/usr/bin"/>
<chmod file="/usr/bin/jbus-client" perm="+x"/>

<elf app="jsudo" cfgdir="lnxcfg/"/>
<elf app="jsudo-ask" cfgdir="lnxcfg/"/>
<elf app="jopen" cfgdir="lnxcfg/"/>
<elf app="jfs" cfgdir="lnxcfg/"/>
<elf app="jimgconvert" cfgdir="lnxcfg/"/>
<elf app="jfr" cfgdir="lnxcfg/"/>
<elf app="pngalpha" cfgdir="lnxcfg/"/>
<elf app="jf-update-desktop-database" cfgdir="lnxcfg/"/>
<elf app="jsmbget" cfgdir="lnxcfg/"/>
<elf app="jservice" cfgdir="lnxcfg/"/>
<elf app="jf-monitor-dir" cfgdir="lnxcfg/"/>
<elf app="jfuse-smb" cfgdir="lnxcfg/"/>
<elf app="jfuse-ftp" cfgdir="lnxcfg/"/>
<elf app="jfuse-ftps" cfgdir="lnxcfg/"/>
<elf app="jfuse-sftp" cfgdir="lnxcfg/"/>
<elf app="jfuse-zip" cfgdir="lnxcfg/"/>
<elf app="jfuse-iso" cfgdir="lnxcfg/"/>
<elf app="jfuse-cdfs" cfgdir="lnxcfg/"/>
<elf app="jfshare" cfgdir="lnxcfg/"/>
<elf app="jcp" cfgdir="lnxcfg/"/>
<elf app="jmv" cfgdir="lnxcfg/"/>
<elf app="jrm" cfgdir="lnxcfg/"/>
<elf app="jver" cfgdir="lnxcfg/"/>
<elf app="jresmgr" cfgdir="lnxcfg/"/>
</target>

<macrodef name="utilsmacro">
<attribute name="app"/>
<attribute name="bits"/>
<sequential>
<copy file="${home}/stubs/win@{bits}c.exe" tofile="@{app}.exe" overwrite="true"/>
<java classpath="${home}/jars/javaforce.jar" classname="javaforce.utils.WinPE" fork="true">
<arg value="@{app}.exe"/>
<arg value="wincfg/@{app}.cfg"/>
</java>
</sequential>
</macrodef>

<target name="utils32" depends="jar" description="build exe for utils 32bit">
<utilsmacro app="jfr" bits="32"/>
<utilsmacro app="jfs" bits="32"/>
<utilsmacro app="jimgconvert" bits="32"/>
<utilsmacro app="pngalpha" bits="32"/>
<utilsmacro app="jfshare" bits="32"/>
<utilsmacro app="WinPE" bits="32"/>
</target>

<target name="utils64" depends="jar" description="build exe for utils 64bit">
<utilsmacro app="jfr" bits="64"/>
<utilsmacro app="jfs" bits="64"/>
<utilsmacro app="jimgconvert" bits="64"/>
<utilsmacro app="pngalpha" bits="64"/>
<utilsmacro app="jfshare" bits="64"/>
<utilsmacro app="WinPE" bits="64"/>
</target>

<target name="clean" description="deletes compiled files">
<delete>
<fileset dir="classes/javaforce" includes="**/*.class"/>
<fileset dir="jars" includes="javaforce.jar"/>
</delete>
</target>

</project>
<project name="javaforce" default="jar" basedir=".">
<description>JavaForce SDK</description>
<!-- set global properties for this build -->
<property name="app" location="javaforce"/>
<property name="src" location="src"/>
<property name="build" location="classes"/>
<property name="home" value="."/>
<property name="version" value="10.1.0"/>

<import file="base.xml"/>

<available property="have_bouncycastle" file="jars/bouncycastle.jar"/>
<target name="bouncycastle" unless="have_bouncycastle" description="download bouncycastle">
<get src="http://pquiring.github.io/javaforce/jars/bouncycastle.jar" dest="jars"/>
</target>

<available property="have_derby" file="jars/derby.jar"/>
<target name="derby" unless="have_derby" description="download derby">
<get src="http://pquiring.github.io/javaforce/jars/derby.jar" dest="jars"/>
</target>

<!-- not in use yet -->
<available property="have_android" file="jars/android.jar"/>
<target name="android" unless="have_android" description="download android">
<get src="http://pquiring.github.io/javaforce/jars/android.jar" dest="jars"/>
</target>

<available property="have_glfw" file="native/glfw/src/window.c"/>
<target name="glfw" unless="have_glfw" description="download glfw">
<exec command="git clone https://github.com/glfw/glfw.git native/glfw"/>
</target>

<target name="depjars" depends="depnatives,bouncycastle,derby,glfw">
</target>

<target name="compile" depends="depjars" description="compile the source">
<!-- Compile the java code from ${src} into ${build} -->
<mkdir dir="${build}"/>
<mkdir dir="jars"/>
<javac srcdir="${src}" destdir="${build}" target="1.6" source="1.6" debug="true" includeantruntime="false">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
<fileset dir="jars" includes="*.jar"/>
</classpath>
</javac>
</target>

<target name="jar" depends="depjars,compile" description="build jar file">
<!-- Build jar file from class files -->
<jar destfile="jars/javaforce.jar" includes="**/*.class" basedir="${build}">
</jar>
</target>

<target name="release-bin" depends="jar" description="create release zip file">
<zip destfile="javaforce-bin-${version}.zip">
<fileset dir=".">
<include name="jars/javaforce.jar"/>
<include name="native/*.dll"/>
<include name="native/*.so"/>
<include name="native/*.dylib"/> <!-- not available yet -->
<include name="stubs/*.exe"/>
<include name="stubs/*.bin"/>
</fileset>
</zip>
<move file="javaforce-bin-${version}.zip" todir="${home}/release"/>
</target>

<target name="get-bin" description="download bin zip file">
<get src="http://github.com/pquiring/javaforce/releases/download/${version}/javaforce-bin-${version}.zip" dest="."/>
<unzip src="javaforce-bin-${version}.zip" dest="."/>
</target>

<target name="javadoc" description="generate java documentation">
<javadoc sourcepath="src" destdir="javadoc">
<classpath>
<fileset dir="jars" includes="*.jar"/>
</classpath>
</javadoc>
</target>

<!-- sudo ant install -->
<target name="install" description="install files">
<copy file="jars/javaforce.jar" todir="/usr/share/java"/>
<copy file="jars/bouncycastle.jar" todir="/usr/share/java"/>
<copy file="jars/filters.jar" todir="/usr/share/java"/>

<copy file="native/jfnative${bits}.so" todir="/usr/lib"/>

<copy file="lnxbin/jbus-call" todir="/usr/bin"/>
<chmod file="/usr/bin/jbus-call" perm="+x"/>
<copy file="lnxbin/jbus-client" todir="/usr/bin"/>
<chmod file="/usr/bin/jbus-client" perm="+x"/>

<elf app="jsudo" cfgdir="lnxcfg/"/>
<elf app="jsudo-ask" cfgdir="lnxcfg/"/>
<elf app="jopen" cfgdir="lnxcfg/"/>
<elf app="jfs" cfgdir="lnxcfg/"/>
<elf app="jimgconvert" cfgdir="lnxcfg/"/>
<elf app="jfr" cfgdir="lnxcfg/"/>
<elf app="pngalpha" cfgdir="lnxcfg/"/>
<elf app="jf-update-desktop-database" cfgdir="lnxcfg/"/>
<elf app="jsmbget" cfgdir="lnxcfg/"/>
<elf app="jservice" cfgdir="lnxcfg/"/>
<elf app="jf-monitor-dir" cfgdir="lnxcfg/"/>
<elf app="jfuse-smb" cfgdir="lnxcfg/"/>
<elf app="jfuse-ftp" cfgdir="lnxcfg/"/>
<elf app="jfuse-ftps" cfgdir="lnxcfg/"/>
<elf app="jfuse-sftp" cfgdir="lnxcfg/"/>
<elf app="jfuse-zip" cfgdir="lnxcfg/"/>
<elf app="jfuse-iso" cfgdir="lnxcfg/"/>
<elf app="jfuse-cdfs" cfgdir="lnxcfg/"/>
<elf app="jfshare" cfgdir="lnxcfg/"/>
<elf app="jcp" cfgdir="lnxcfg/"/>
<elf app="jmv" cfgdir="lnxcfg/"/>
<elf app="jrm" cfgdir="lnxcfg/"/>
<elf app="jver" cfgdir="lnxcfg/"/>
<elf app="jresmgr" cfgdir="lnxcfg/"/>
</target>

<macrodef name="utilsmacro">
<attribute name="app"/>
<attribute name="bits"/>
<sequential>
<copy file="${home}/stubs/win@{bits}c.exe" tofile="@{app}.exe" overwrite="true"/>
<java classpath="${home}/jars/javaforce.jar" classname="javaforce.utils.WinPE" fork="true">
<arg value="@{app}.exe"/>
<arg value="wincfg/@{app}.cfg"/>
</java>
</sequential>
</macrodef>

<target name="utils32" depends="jar" description="build exe for utils 32bit">
<utilsmacro app="jfr" bits="32"/>
<utilsmacro app="jfs" bits="32"/>
<utilsmacro app="jimgconvert" bits="32"/>
<utilsmacro app="pngalpha" bits="32"/>
<utilsmacro app="jfshare" bits="32"/>
<utilsmacro app="WinPE" bits="32"/>
</target>

<target name="utils64" depends="jar" description="build exe for utils 64bit">
<utilsmacro app="jfr" bits="64"/>
<utilsmacro app="jfs" bits="64"/>
<utilsmacro app="jimgconvert" bits="64"/>
<utilsmacro app="pngalpha" bits="64"/>
<utilsmacro app="jfshare" bits="64"/>
<utilsmacro app="WinPE" bits="64"/>
</target>

<target name="clean" description="deletes compiled files">
<delete>
<fileset dir="classes/javaforce" includes="**/*.class"/>
<fileset dir="jars" includes="javaforce.jar"/>
</delete>
</target>

</project>
22 changes: 11 additions & 11 deletions deb/control
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: javaforce
Version: 10.0.0
Architecture: amd64
Maintainer: Peter Quiring <[email protected]>
Installed-Size: 290
Depends: openjdk-8-jre, libjsch-java (>= 0.1.42), libjzlib-java, libjcifs-java, fuse, libfuse2, fuseiso, libcdio13, mate-icon-theme
Components: main
Provides:
Section: java
Priority: optional
Description: JavaForce base classes.
Package: javaforce
Version: 10.1.0
Architecture: amd64
Maintainer: Peter Quiring <[email protected]>
Installed-Size: 290
Depends: openjdk-8-jre, libjsch-java (>= 0.1.42), libjzlib-java, libjcifs-java, fuse, libfuse2, fuseiso, libcdio13, mate-icon-theme
Components: main
Provides:
Section: java
Priority: optional
Description: JavaForce base classes.
Loading

0 comments on commit aac3903

Please sign in to comment.