Skip to content

Commit 9cc3deb

Browse files
pquiringpquiring
committed
Merge 10.3.0 to master
2 parents 39a83fd + 46b4889 commit 9cc3deb

28 files changed

Lines changed: 4692 additions & 4187 deletions

‎base.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<exemacro appx="@{app5}" bits="@{bits}" ico="@{ico}" unless:blank="@{app5}"/>
7272
<exec command="candle ${candle_extra} -o wix.obj @{xml}.xml"/>
7373
<exec command="candle -o jre.obj ${home}/nojre.xml"/>
74-
<exec command="light ${light_extra} -ext WixUIExtension -cultures:en-us -o @{msi}-${version}-win@{bits}.msi jre.obj wix.obj"/>
74+
<exec command="light ${light_extra} -ext WixUIExtension -cultures:en-us -b ${home} -dWixUILicenseRtf=${home}/license.rtf -o @{msi}-${version}-win@{bits}.msi jre.obj wix.obj"/>
7575
<delete file="wix.obj"/>
7676
<delete file="@{msi}-${version}-win@{bits}.wixpdb"/>
7777
<move unless:set="nomove" file="@{msi}-${version}-win@{bits}.msi" todir="${home}/release"/>
@@ -109,7 +109,7 @@
109109
<arg value="win@{bits}"/>
110110
</java>
111111
<exec command="candle -o jre.obj jre.xml"/>
112-
<exec command="light ${light_extra} -ext WixUIExtension -cultures:en-us -o @{msi}-${version}-win@{bits}.msi wix.obj jre.obj"/>
112+
<exec command="light ${light_extra} -ext WixUIExtension -cultures:en-us -b ${home} -dWixUILicenseRtf=${home}/license.rtf -o @{msi}-${version}-win@{bits}.msi wix.obj jre.obj"/>
113113
<delete file="wix.obj"/>
114114
<delete file="jre.obj"/>
115115
<delete file="jre.xml"/>

‎build.xml‎

Lines changed: 157 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,157 @@
1-
<project name="javaforce" default="jar" basedir=".">
2-
<description>JavaForce SDK</description>
3-
<!-- set global properties for this build -->
4-
<property name="app" location="javaforce"/>
5-
<property name="src" location="src"/>
6-
<property name="build" location="classes"/>
7-
<property name="home" value="."/>
8-
<property name="version" value="10.2.0"/>
9-
10-
<import file="base.xml"/>
11-
12-
<available property="have_bouncycastle" file="jars/bouncycastle.jar"/>
13-
<target name="bouncycastle" unless="have_bouncycastle" description="download bouncycastle">
14-
<get src="http://pquiring.github.io/javaforce/jars/bouncycastle.jar" dest="jars"/>
15-
</target>
16-
17-
<available property="have_derby" file="jars/derby.jar"/>
18-
<target name="derby" unless="have_derby" description="download derby">
19-
<get src="http://pquiring.github.io/javaforce/jars/derby.jar" dest="jars"/>
20-
</target>
21-
22-
<!-- not in use yet -->
23-
<available property="have_android" file="jars/android.jar"/>
24-
<target name="android" unless="have_android" description="download android">
25-
<get src="http://pquiring.github.io/javaforce/jars/android.jar" dest="jars"/>
26-
</target>
27-
28-
<available property="have_glfw" file="native/glfw/src/window.c"/>
29-
<target name="glfw" unless="have_glfw" description="download glfw">
30-
<exec command="git clone https://github.com/glfw/glfw.git native/glfw"/>
31-
</target>
32-
33-
<target name="depjars" depends="depnatives,bouncycastle,derby,glfw">
34-
</target>
35-
36-
<target name="compile" depends="depjars" description="compile the source">
37-
<!-- Compile the java code from ${src} into ${build} -->
38-
<mkdir dir="${build}"/>
39-
<mkdir dir="jars"/>
40-
<javac srcdir="${src}" destdir="${build}" target="1.6" source="1.6" debug="true" includeantruntime="false">
41-
<compilerarg value="-Xlint:unchecked"/>
42-
<classpath>
43-
<fileset dir="jars" includes="*.jar"/>
44-
</classpath>
45-
</javac>
46-
</target>
47-
48-
<target name="jar" depends="depjars,compile" description="build jar file">
49-
<!-- Build jar file from class files -->
50-
<jar destfile="jars/javaforce.jar" includes="**/*.class" basedir="${build}">
51-
</jar>
52-
</target>
53-
54-
<target name="release-bin" depends="jar" description="create release zip file">
55-
<zip destfile="javaforce-bin-${version}.zip">
56-
<fileset dir=".">
57-
<include name="jars/javaforce.jar"/>
58-
<include name="native/*.dll"/>
59-
<include name="native/*.so"/>
60-
<include name="native/*.dylib"/> <!-- not available yet -->
61-
<include name="stubs/*.exe"/>
62-
<include name="stubs/*.bin"/>
63-
</fileset>
64-
</zip>
65-
<move file="javaforce-bin-${version}.zip" todir="${home}/release"/>
66-
</target>
67-
68-
<target name="get-bin" description="download bin zip file">
69-
<get src="http://github.com/pquiring/javaforce/releases/download/${version}/javaforce-bin-${version}.zip" dest="."/>
70-
<unzip src="javaforce-bin-${version}.zip" dest="."/>
71-
</target>
72-
73-
<target name="javadoc" description="generate java documentation">
74-
<javadoc sourcepath="src" destdir="javadoc">
75-
<classpath>
76-
<fileset dir="jars" includes="*.jar"/>
77-
</classpath>
78-
</javadoc>
79-
</target>
80-
81-
<!-- sudo ant install -->
82-
<target name="install" description="install files">
83-
<copy file="jars/javaforce.jar" todir="/usr/share/java"/>
84-
<copy file="jars/bouncycastle.jar" todir="/usr/share/java"/>
85-
<copy file="jars/filters.jar" todir="/usr/share/java"/>
86-
87-
<copy file="native/jfnative${bits}.so" todir="/usr/lib"/>
88-
89-
<copy file="lnxbin/jbus-call" todir="/usr/bin"/>
90-
<chmod file="/usr/bin/jbus-call" perm="+x"/>
91-
<copy file="lnxbin/jbus-client" todir="/usr/bin"/>
92-
<chmod file="/usr/bin/jbus-client" perm="+x"/>
93-
94-
<elf app="jsudo" cfgdir="lnxcfg/"/>
95-
<elf app="jsudo-ask" cfgdir="lnxcfg/"/>
96-
<elf app="jopen" cfgdir="lnxcfg/"/>
97-
<elf app="jfs" cfgdir="lnxcfg/"/>
98-
<elf app="jimgconvert" cfgdir="lnxcfg/"/>
99-
<elf app="jfr" cfgdir="lnxcfg/"/>
100-
<elf app="pngalpha" cfgdir="lnxcfg/"/>
101-
<elf app="jf-update-desktop-database" cfgdir="lnxcfg/"/>
102-
<elf app="jsmbget" cfgdir="lnxcfg/"/>
103-
<elf app="jservice" cfgdir="lnxcfg/"/>
104-
<elf app="jf-monitor-dir" cfgdir="lnxcfg/"/>
105-
<elf app="jfuse-smb" cfgdir="lnxcfg/"/>
106-
<elf app="jfuse-ftp" cfgdir="lnxcfg/"/>
107-
<elf app="jfuse-ftps" cfgdir="lnxcfg/"/>
108-
<elf app="jfuse-sftp" cfgdir="lnxcfg/"/>
109-
<elf app="jfuse-zip" cfgdir="lnxcfg/"/>
110-
<elf app="jfuse-iso" cfgdir="lnxcfg/"/>
111-
<elf app="jfuse-cdfs" cfgdir="lnxcfg/"/>
112-
<elf app="jfshare" cfgdir="lnxcfg/"/>
113-
<elf app="jcp" cfgdir="lnxcfg/"/>
114-
<elf app="jmv" cfgdir="lnxcfg/"/>
115-
<elf app="jrm" cfgdir="lnxcfg/"/>
116-
<elf app="jver" cfgdir="lnxcfg/"/>
117-
<elf app="jresmgr" cfgdir="lnxcfg/"/>
118-
</target>
119-
120-
<macrodef name="utilsmacro">
121-
<attribute name="app"/>
122-
<attribute name="bits"/>
123-
<sequential>
124-
<copy file="${home}/stubs/win@{bits}c.exe" tofile="@{app}.exe" overwrite="true"/>
125-
<java classpath="${home}/jars/javaforce.jar" classname="javaforce.utils.WinPE" fork="true">
126-
<arg value="@{app}.exe"/>
127-
<arg value="wincfg/@{app}.cfg"/>
128-
</java>
129-
</sequential>
130-
</macrodef>
131-
132-
<target name="utils32" depends="jar" description="build exe for utils 32bit">
133-
<utilsmacro app="jfr" bits="32"/>
134-
<utilsmacro app="jfs" bits="32"/>
135-
<utilsmacro app="jimgconvert" bits="32"/>
136-
<utilsmacro app="pngalpha" bits="32"/>
137-
<utilsmacro app="jfshare" bits="32"/>
138-
<utilsmacro app="WinPE" bits="32"/>
139-
</target>
140-
141-
<target name="utils64" depends="jar" description="build exe for utils 64bit">
142-
<utilsmacro app="jfr" bits="64"/>
143-
<utilsmacro app="jfs" bits="64"/>
144-
<utilsmacro app="jimgconvert" bits="64"/>
145-
<utilsmacro app="pngalpha" bits="64"/>
146-
<utilsmacro app="jfshare" bits="64"/>
147-
<utilsmacro app="WinPE" bits="64"/>
148-
</target>
149-
150-
<target name="clean" description="deletes compiled files">
151-
<delete>
152-
<fileset dir="classes/javaforce" includes="**/*.class"/>
153-
<fileset dir="jars" includes="javaforce.jar"/>
154-
</delete>
155-
</target>
156-
157-
</project>
1+
<project name="javaforce" default="jar" basedir=".">
2+
<description>JavaForce SDK</description>
3+
<!-- set global properties for this build -->
4+
<property name="app" location="javaforce"/>
5+
<property name="src" location="src"/>
6+
<property name="build" location="classes"/>
7+
<property name="home" value="."/>
8+
<property name="version" value="10.3.0"/>
9+
10+
<import file="base.xml"/>
11+
12+
<available property="have_bouncycastle" file="jars/bouncycastle.jar"/>
13+
<target name="bouncycastle" unless="have_bouncycastle" description="download bouncycastle">
14+
<get src="http://pquiring.github.io/javaforce/jars/bouncycastle.jar" dest="jars"/>
15+
</target>
16+
17+
<available property="have_derby" file="jars/derby.jar"/>
18+
<target name="derby" unless="have_derby" description="download derby">
19+
<get src="http://pquiring.github.io/javaforce/jars/derby.jar" dest="jars"/>
20+
</target>
21+
22+
<!-- not in use yet -->
23+
<available property="have_android" file="jars/android.jar"/>
24+
<target name="android" unless="have_android" description="download android">
25+
<get src="http://pquiring.github.io/javaforce/jars/android.jar" dest="jars"/>
26+
</target>
27+
28+
<available property="have_glfw" file="native/glfw/src/window.c"/>
29+
<target name="glfw" unless="have_glfw" description="download glfw">
30+
<exec command="git clone https://github.com/glfw/glfw.git native/glfw"/>
31+
</target>
32+
33+
<target name="depjars" depends="depnatives,bouncycastle,derby,glfw">
34+
</target>
35+
36+
<target name="compile" depends="depjars" description="compile the source">
37+
<!-- Compile the java code from ${src} into ${build} -->
38+
<mkdir dir="${build}"/>
39+
<mkdir dir="jars"/>
40+
<javac srcdir="${src}" destdir="${build}" target="1.6" source="1.6" debug="true" includeantruntime="false">
41+
<compilerarg value="-Xlint:unchecked"/>
42+
<classpath>
43+
<fileset dir="jars" includes="*.jar"/>
44+
</classpath>
45+
</javac>
46+
</target>
47+
48+
<target name="jar" depends="depjars,compile" description="build jar file">
49+
<!-- Build jar file from class files -->
50+
<jar destfile="jars/javaforce.jar" includes="**/*.class" basedir="${build}">
51+
</jar>
52+
</target>
53+
54+
<target name="release-bin" depends="jar" description="create release zip file">
55+
<zip destfile="javaforce-bin-${version}.zip">
56+
<fileset dir=".">
57+
<include name="jars/javaforce.jar"/>
58+
<include name="native/*.dll"/>
59+
<include name="native/*.so"/>
60+
<include name="native/*.dylib"/> <!-- not available yet -->
61+
<include name="stubs/*.exe"/>
62+
<include name="stubs/*.bin"/>
63+
</fileset>
64+
</zip>
65+
<move file="javaforce-bin-${version}.zip" todir="${home}/release"/>
66+
</target>
67+
68+
<target name="get-bin" description="download bin zip file">
69+
<get src="http://github.com/pquiring/javaforce/releases/download/${version}/javaforce-bin-${version}.zip" dest="."/>
70+
<unzip src="javaforce-bin-${version}.zip" dest="."/>
71+
</target>
72+
73+
<target name="javadoc" description="generate java documentation">
74+
<javadoc sourcepath="src" destdir="javadoc">
75+
<classpath>
76+
<fileset dir="jars" includes="*.jar"/>
77+
</classpath>
78+
</javadoc>
79+
</target>
80+
81+
<!-- sudo ant install -->
82+
<target name="install" description="install files">
83+
<copy file="jars/javaforce.jar" todir="/usr/share/java"/>
84+
<copy file="jars/bouncycastle.jar" todir="/usr/share/java"/>
85+
<copy file="jars/filters.jar" todir="/usr/share/java"/>
86+
87+
<copy file="native/jfnative${bits}.so" todir="/usr/lib"/>
88+
89+
<copy file="lnxbin/jbus-call" todir="/usr/bin"/>
90+
<chmod file="/usr/bin/jbus-call" perm="+x"/>
91+
<copy file="lnxbin/jbus-client" todir="/usr/bin"/>
92+
<chmod file="/usr/bin/jbus-client" perm="+x"/>
93+
94+
<elf app="jsudo" cfgdir="lnxcfg/"/>
95+
<elf app="jsudo-ask" cfgdir="lnxcfg/"/>
96+
<elf app="jopen" cfgdir="lnxcfg/"/>
97+
<elf app="jfs" cfgdir="lnxcfg/"/>
98+
<elf app="jimgconvert" cfgdir="lnxcfg/"/>
99+
<elf app="jfr" cfgdir="lnxcfg/"/>
100+
<elf app="pngalpha" cfgdir="lnxcfg/"/>
101+
<elf app="jf-update-desktop-database" cfgdir="lnxcfg/"/>
102+
<elf app="jsmbget" cfgdir="lnxcfg/"/>
103+
<elf app="jservice" cfgdir="lnxcfg/"/>
104+
<elf app="jf-monitor-dir" cfgdir="lnxcfg/"/>
105+
<elf app="jfuse-smb" cfgdir="lnxcfg/"/>
106+
<elf app="jfuse-ftp" cfgdir="lnxcfg/"/>
107+
<elf app="jfuse-ftps" cfgdir="lnxcfg/"/>
108+
<elf app="jfuse-sftp" cfgdir="lnxcfg/"/>
109+
<elf app="jfuse-zip" cfgdir="lnxcfg/"/>
110+
<elf app="jfuse-iso" cfgdir="lnxcfg/"/>
111+
<elf app="jfuse-cdfs" cfgdir="lnxcfg/"/>
112+
<elf app="jfshare" cfgdir="lnxcfg/"/>
113+
<elf app="jcp" cfgdir="lnxcfg/"/>
114+
<elf app="jmv" cfgdir="lnxcfg/"/>
115+
<elf app="jrm" cfgdir="lnxcfg/"/>
116+
<elf app="jver" cfgdir="lnxcfg/"/>
117+
<elf app="jresmgr" cfgdir="lnxcfg/"/>
118+
</target>
119+
120+
<macrodef name="utilsmacro">
121+
<attribute name="app"/>
122+
<attribute name="bits"/>
123+
<sequential>
124+
<copy file="${home}/stubs/win@{bits}c.exe" tofile="@{app}.exe" overwrite="true"/>
125+
<java classpath="${home}/jars/javaforce.jar" classname="javaforce.utils.WinPE" fork="true">
126+
<arg value="@{app}.exe"/>
127+
<arg value="wincfg/@{app}.cfg"/>
128+
</java>
129+
</sequential>
130+
</macrodef>
131+
132+
<target name="utils32" depends="jar" description="build exe for utils 32bit">
133+
<utilsmacro app="jfr" bits="32"/>
134+
<utilsmacro app="jfs" bits="32"/>
135+
<utilsmacro app="jimgconvert" bits="32"/>
136+
<utilsmacro app="pngalpha" bits="32"/>
137+
<utilsmacro app="jfshare" bits="32"/>
138+
<utilsmacro app="WinPE" bits="32"/>
139+
</target>
140+
141+
<target name="utils64" depends="jar" description="build exe for utils 64bit">
142+
<utilsmacro app="jfr" bits="64"/>
143+
<utilsmacro app="jfs" bits="64"/>
144+
<utilsmacro app="jimgconvert" bits="64"/>
145+
<utilsmacro app="pngalpha" bits="64"/>
146+
<utilsmacro app="jfshare" bits="64"/>
147+
<utilsmacro app="WinPE" bits="64"/>
148+
</target>
149+
150+
<target name="clean" description="deletes compiled files">
151+
<delete>
152+
<fileset dir="classes/javaforce" includes="**/*.class"/>
153+
<fileset dir="jars" includes="javaforce.jar"/>
154+
</delete>
155+
</target>
156+
157+
</project>

‎deb/control‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Package: javaforce
2-
Version: 10.2.0
3-
Architecture: amd64
4-
Maintainer: Peter Quiring <pquiring@jflinux.org>
5-
Installed-Size: 290
6-
Depends: openjdk-8-jre, libjsch-java (>= 0.1.42), libjzlib-java, libjcifs-java, fuse, libfuse2, fuseiso, libcdio13, mate-icon-theme
7-
Components: main
8-
Provides:
9-
Section: java
10-
Priority: optional
11-
Description: JavaForce base classes.
1+
Package: javaforce
2+
Version: 10.3.0
3+
Architecture: amd64
4+
Maintainer: Peter Quiring <pquiring@jflinux.org>
5+
Installed-Size: 290
6+
Depends: openjdk-8-jre, libjsch-java (>= 0.1.42), libjzlib-java, libjcifs-java, fuse, libfuse2, fuseiso, libcdio13, mate-icon-theme
7+
Components: main
8+
Provides:
9+
Section: java
10+
Priority: optional
11+
Description: JavaForce base classes.

0 commit comments

Comments
 (0)