Skip to content

Commit d83d16a

Browse files
pquiringpquiring
committed
add license.rtf to wix generated files
1 parent ec8d237 commit d83d16a

File tree

13 files changed

+2874
-2357
lines changed

13 files changed

+2874
-2357
lines changed

‎base.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<project xmlns:if="ant:if" xmlns:unless="ant:unless">
33
<property file="${home}/base.properties"/>
44

5+
<pathconvert property="home.platform">
6+
<path location="${home}"/>
7+
</pathconvert>
8+
59
<target name="javadoc" description="generate java documentation">
610
<javadoc sourcepath="src" sourcefiles="src/*.java" destdir="javadoc">
711
<classpath>
@@ -71,7 +75,7 @@
7175
<exemacro appx="@{app5}" bits="@{bits}" ico="@{ico}" unless:blank="@{app5}"/>
7276
<exec command="candle ${candle_extra} -o wix.obj @{xml}.xml"/>
7377
<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"/>
78+
<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"/>
7579
<delete file="wix.obj"/>
7680
<delete file="@{msi}-${version}-win@{bits}.wixpdb"/>
7781
<move unless:set="nomove" file="@{msi}-${version}-win@{bits}.msi" todir="${home}/release"/>
@@ -109,7 +113,7 @@
109113
<arg value="win@{bits}"/>
110114
</java>
111115
<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"/>
116+
<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"/>
113117
<delete file="wix.obj"/>
114118
<delete file="jre.obj"/>
115119
<delete file="jre.xml"/>

‎license.rtf

+509
Large diffs are not rendered by default.

‎projects/jphonelite-android/AndroidManifest.xml

+49-49
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.jphonelite"
4-
android:versionCode="13"
5-
android:versionName="1.9.6" >
6-
7-
<uses-sdk android:minSdkVersion="5"
8-
android:targetSdkVersion="7" />
9-
<uses-permission android:name="android.permission.INTERNET" />
10-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
11-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
12-
<uses-permission android:name="android.permission.READ_CONTACTS" />
13-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
14-
15-
<application android:label="jPhoneLite" android:icon="@drawable/ic_main">
16-
<activity android:name="Main"
17-
android:screenOrientation="portrait"
18-
android:configChanges="keyboardHidden|orientation">
19-
<intent-filter>
20-
<action android:name="android.intent.action.MAIN" />
21-
<category android:name="android.intent.category.LAUNCHER" />
22-
</intent-filter>
23-
</activity>
24-
<activity android:name="ViewSettings"
25-
android:screenOrientation="portrait"
26-
android:configChanges="keyboardHidden|orientation">
27-
<intent-filter>
28-
<action android:name="android.intent.action.VIEW" />
29-
<category android:name="android.intent.category.DEFAULT" />
30-
</intent-filter>
31-
</activity>
32-
<activity android:name="ViewGlobal"
33-
android:screenOrientation="portrait"
34-
android:configChanges="keyboardHidden|orientation">
35-
<intent-filter>
36-
<action android:name="android.intent.action.VIEW" />
37-
<category android:name="android.intent.category.DEFAULT" />
38-
</intent-filter>
39-
</activity>
40-
<activity android:name="ViewLine"
41-
android:screenOrientation="portrait"
42-
android:configChanges="keyboardHidden|orientation">
43-
<intent-filter>
44-
<action android:name="android.intent.action.VIEW" />
45-
<category android:name="android.intent.category.DEFAULT" />
46-
</intent-filter>
47-
</activity>
48-
</application>
49-
</manifest>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.jphonelite"
4+
android:versionCode="13"
5+
android:versionName="1.9.8" >
6+
7+
<uses-sdk android:minSdkVersion="5"
8+
android:targetSdkVersion="7" />
9+
<uses-permission android:name="android.permission.INTERNET" />
10+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
11+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
12+
<uses-permission android:name="android.permission.READ_CONTACTS" />
13+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
14+
15+
<application android:label="jPhoneLite" android:icon="@drawable/ic_main">
16+
<activity android:name="Main"
17+
android:screenOrientation="portrait"
18+
android:configChanges="keyboardHidden|orientation">
19+
<intent-filter>
20+
<action android:name="android.intent.action.MAIN" />
21+
<category android:name="android.intent.category.LAUNCHER" />
22+
</intent-filter>
23+
</activity>
24+
<activity android:name="ViewSettings"
25+
android:screenOrientation="portrait"
26+
android:configChanges="keyboardHidden|orientation">
27+
<intent-filter>
28+
<action android:name="android.intent.action.VIEW" />
29+
<category android:name="android.intent.category.DEFAULT" />
30+
</intent-filter>
31+
</activity>
32+
<activity android:name="ViewGlobal"
33+
android:screenOrientation="portrait"
34+
android:configChanges="keyboardHidden|orientation">
35+
<intent-filter>
36+
<action android:name="android.intent.action.VIEW" />
37+
<category android:name="android.intent.category.DEFAULT" />
38+
</intent-filter>
39+
</activity>
40+
<activity android:name="ViewLine"
41+
android:screenOrientation="portrait"
42+
android:configChanges="keyboardHidden|orientation">
43+
<intent-filter>
44+
<action android:name="android.intent.action.VIEW" />
45+
<category android:name="android.intent.category.DEFAULT" />
46+
</intent-filter>
47+
</activity>
48+
</application>
49+
</manifest>

‎projects/jphonelite-android/res/values/strings.xml

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<resources>
4-
<string name="main_text1_text">init</string>
5-
<string name="main_text2_text">init</string>
6-
<string name="main_about_text">jPhoneLite/1.9.6</string>
7-
<string name="settings_line_x_prompt">Select Line Config</string>
8-
<string-array name="line_2">
9-
<item>Use Settings Below</item>
10-
<item>Duplicate of Line 1</item>
11-
<item>Duplicate of Line 3</item>
12-
<item>Duplicate of Line 4</item>
13-
<item>Duplicate of Line 5</item>
14-
<item>Duplicate of Line 6</item>
15-
</string-array>
16-
<string-array name="line_3">
17-
<item>Use Settings Below</item>
18-
<item>Duplicate of Line 1</item>
19-
<item>Duplicate of Line 2</item>
20-
<item>Duplicate of Line 4</item>
21-
<item>Duplicate of Line 5</item>
22-
<item>Duplicate of Line 6</item>
23-
</string-array>
24-
<string-array name="line_4">
25-
<item>Use Settings Below</item>
26-
<item>Duplicate of Line 1</item>
27-
<item>Duplicate of Line 2</item>
28-
<item>Duplicate of Line 3</item>
29-
<item>Duplicate of Line 5</item>
30-
<item>Duplicate of Line 6</item>
31-
</string-array>
32-
<string-array name="line_5">
33-
<item>Use Settings Below</item>
34-
<item>Duplicate of Line 1</item>
35-
<item>Duplicate of Line 2</item>
36-
<item>Duplicate of Line 3</item>
37-
<item>Duplicate of Line 4</item>
38-
<item>Duplicate of Line 6</item>
39-
</string-array>
40-
<string-array name="line_6">
41-
<item>Use Settings Below</item>
42-
<item>Duplicate of Line 1</item>
43-
<item>Duplicate of Line 2</item>
44-
<item>Duplicate of Line 3</item>
45-
<item>Duplicate of Line 4</item>
46-
<item>Duplicate of Line 5</item>
47-
</string-array>
48-
</resources>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<resources>
4+
<string name="main_text1_text">init</string>
5+
<string name="main_text2_text">init</string>
6+
<string name="main_about_text">jPhoneLite/1.9.8</string>
7+
<string name="settings_line_x_prompt">Select Line Config</string>
8+
<string-array name="line_2">
9+
<item>Use Settings Below</item>
10+
<item>Duplicate of Line 1</item>
11+
<item>Duplicate of Line 3</item>
12+
<item>Duplicate of Line 4</item>
13+
<item>Duplicate of Line 5</item>
14+
<item>Duplicate of Line 6</item>
15+
</string-array>
16+
<string-array name="line_3">
17+
<item>Use Settings Below</item>
18+
<item>Duplicate of Line 1</item>
19+
<item>Duplicate of Line 2</item>
20+
<item>Duplicate of Line 4</item>
21+
<item>Duplicate of Line 5</item>
22+
<item>Duplicate of Line 6</item>
23+
</string-array>
24+
<string-array name="line_4">
25+
<item>Use Settings Below</item>
26+
<item>Duplicate of Line 1</item>
27+
<item>Duplicate of Line 2</item>
28+
<item>Duplicate of Line 3</item>
29+
<item>Duplicate of Line 5</item>
30+
<item>Duplicate of Line 6</item>
31+
</string-array>
32+
<string-array name="line_5">
33+
<item>Use Settings Below</item>
34+
<item>Duplicate of Line 1</item>
35+
<item>Duplicate of Line 2</item>
36+
<item>Duplicate of Line 3</item>
37+
<item>Duplicate of Line 4</item>
38+
<item>Duplicate of Line 6</item>
39+
</string-array>
40+
<string-array name="line_6">
41+
<item>Use Settings Below</item>
42+
<item>Duplicate of Line 1</item>
43+
<item>Duplicate of Line 2</item>
44+
<item>Duplicate of Line 3</item>
45+
<item>Duplicate of Line 4</item>
46+
<item>Duplicate of Line 5</item>
47+
</string-array>
48+
</resources>

‎projects/jphonelite-android/tools.xml

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
<project name="jphonelite-android-tools" default="depjars" basedir=".">
2-
<description>jphonelite-android-tools</description>
3-
<!-- set global properties for this build -->
4-
<property name="src" location="."/>
5-
<property name="build" location="."/>
6-
<property name="home" location="../.."/>
7-
<property name="version" value="1.9.6"/>
8-
9-
<target name="depjars">
10-
<copy file="${home}/jars/bouncycastle.jar" todir="libs"/>
11-
</target>
12-
13-
<available property="keyexists" file="keystore.key"/>
14-
15-
<target name="genkeys" unless="keyexists" description="generate SSL keys">
16-
<genkey alias="jphonelite" storepass="password" keystore="keystore.key"
17-
keyalg="RSA" validity="10000">
18-
<dname>
19-
<param name="CN" value="Peter Quiring"/>
20-
<param name="OU" value="ITM"/>
21-
<param name="O" value="jphonelite.sourceforge.net"/>
22-
<param name="C" value="CA"/>
23-
</dname>
24-
</genkey>
25-
</target>
26-
27-
<target name="release-bin" depends="" description="create release zip file">
28-
<copy file="bin/jphonelite-release.apk" tofile="${home}/release/jphonelite-${version}.apk" overwrite="true"/>
29-
</target>
30-
31-
<target name="release-src" depends="" description="create release zip file">
32-
<zip destfile="jphonelite-android-src-${version}.zip">
33-
<fileset dir="../../..">
34-
<include name="jf/projects/jphonelite-android/**/*"/>
35-
<include name="jf/jars/bouncycastle.jar"/>
36-
37-
<exclude name="jf/projects/jphonelite-android/**/*.zip"/>
38-
<exclude name="jf/projects/jphonelite-android/libs/*.jar"/>
39-
<exclude name="jf/projects/jphonelite-android/**/*.bat"/>
40-
<exclude name="jf/projects/jphonelite-android/**/*.key"/>
41-
<exclude name="jf/projects/jphonelite-android/bin/**/*"/>
42-
<exclude name="jf/projects/jphonelite-android/gen/**/*"/>
43-
</fileset>
44-
</zip>
45-
<move file="jphonelite-android-src-${version}.zip" todir="${home}/release"/>
46-
</target>
47-
48-
<target name="javadoc" description="generate java documentation">
49-
<javadoc sourcefiles="*.java" destdir="javadoc"/>
50-
</target>
51-
</project>
1+
<project name="jphonelite-android-tools" default="depjars" basedir=".">
2+
<description>jphonelite-android-tools</description>
3+
<!-- set global properties for this build -->
4+
<property name="src" location="."/>
5+
<property name="build" location="."/>
6+
<property name="home" location="../.."/>
7+
<property name="version" value="1.9.8"/>
8+
9+
<target name="depjars">
10+
<copy file="${home}/jars/bouncycastle.jar" todir="libs"/>
11+
</target>
12+
13+
<available property="keyexists" file="keystore.key"/>
14+
15+
<target name="genkeys" unless="keyexists" description="generate SSL keys">
16+
<genkey alias="jphonelite" storepass="password" keystore="keystore.key"
17+
keyalg="RSA" validity="10000">
18+
<dname>
19+
<param name="CN" value="Peter Quiring"/>
20+
<param name="OU" value="ITM"/>
21+
<param name="O" value="jphonelite.sourceforge.net"/>
22+
<param name="C" value="CA"/>
23+
</dname>
24+
</genkey>
25+
</target>
26+
27+
<target name="release-bin" depends="" description="create release zip file">
28+
<copy file="bin/jphonelite-release.apk" tofile="${home}/release/jphonelite-${version}.apk" overwrite="true"/>
29+
</target>
30+
31+
<target name="release-src" depends="" description="create release zip file">
32+
<zip destfile="jphonelite-android-src-${version}.zip">
33+
<fileset dir="../../..">
34+
<include name="jf/projects/jphonelite-android/**/*"/>
35+
<include name="jf/jars/bouncycastle.jar"/>
36+
37+
<exclude name="jf/projects/jphonelite-android/**/*.zip"/>
38+
<exclude name="jf/projects/jphonelite-android/libs/*.jar"/>
39+
<exclude name="jf/projects/jphonelite-android/**/*.bat"/>
40+
<exclude name="jf/projects/jphonelite-android/**/*.key"/>
41+
<exclude name="jf/projects/jphonelite-android/bin/**/*"/>
42+
<exclude name="jf/projects/jphonelite-android/gen/**/*"/>
43+
</fileset>
44+
</zip>
45+
<move file="jphonelite-android-src-${version}.zip" todir="${home}/release"/>
46+
</target>
47+
48+
<target name="javadoc" description="generate java documentation">
49+
<javadoc sourcefiles="*.java" destdir="javadoc"/>
50+
</target>
51+
</project>

0 commit comments

Comments
 (0)