Skip to content

Commit e9486ba

Browse files
faiteanufaiteanu
committed
img-Verzeichnis auch in JAR einschließen, für die Icons
1 parent 24172f3 commit e9486ba

File tree

2 files changed

+50
-45
lines changed

2 files changed

+50
-45
lines changed

‎build/build.properties‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ define.compilepath = ${define.jameica.dir}/lib/swt/linux/swt.jar;\
1111
${define.jameica.dir}/lib/nanoxml/nanoxml-2.2.3.jar;\
1212
${define.jameica.dir}/lib/paperclips/net.sf.paperclips_1.0.4.jar;\
1313
${define.jameica.dir}/lib/java_ee/javax.annotation-api-1.3.2.jar;\
14-
;\
14+
;\
1515
${define.hibiscus.dir}/releases/hibiscus-lib.jar;\
16-
${define.hibiscus.dir}/lib/hbci4j-core-3.1.51.jar;\
17-
;\
18-
../hibiscus.ly.toolkit/hibiscus.ly.toolkit.jar;
16+
${define.hibiscus.dir}/lib/hbci4j-core-3.1.55.jar;\
17+
;\
18+
../hibiscus.ly.toolkit/hibiscus.ly.toolkit.jar;
1919
define.javadoc.package = de.willuhn.jameica
2020

2121
define.java.version = 1.8
2222
define.encoding = UTF-8
23+
24+
img.dir = src/img

‎build/build.xml‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55

66

77

8-
<target name="init" description="inits the build">
8+
<target name="init" description="inits the build">
99

10-
<property environment="env" />
11-
<property name="build.dir" value="build" />
12-
<buildnumber file="${build.dir}/BUILD" />
13-
<xmlproperty file="plugin.xml" collapseattributes="true"/>
10+
<property environment="env" />
11+
<property name="build.dir" value="build" />
12+
<buildnumber file="${build.dir}/BUILD" />
13+
<xmlproperty file="plugin.xml" collapseattributes="true"/>
1414

15-
<!-- create cvs tag -->
16-
<propertyfile file="${build.dir}/TAG">
17-
<entry key="mytag" value="${plugin.version}" />
18-
</propertyfile>
19-
<replaceregexp flags="g" file="${build.dir}/TAG" match="\." replace="_" />
20-
<loadproperties srcFile="${build.dir}/TAG"/>
21-
<delete file="${build.dir}/TAG" />
22-
<property name="tag" value="V_${mytag}_BUILD_${build.number}" />
15+
<!-- create cvs tag -->
16+
<propertyfile file="${build.dir}/TAG">
17+
<entry key="mytag" value="${plugin.version}" />
18+
</propertyfile>
19+
<replaceregexp flags="g" file="${build.dir}/TAG" match="\." replace="_" />
20+
<loadproperties srcFile="${build.dir}/TAG"/>
21+
<delete file="${build.dir}/TAG" />
22+
<property name="tag" value="V_${mytag}_BUILD_${build.number}" />
2323

24-
<loadproperties srcFile="${build.dir}/build.properties"/>
24+
<loadproperties srcFile="${build.dir}/build.properties"/>
2525

26-
<echo message="VERSION: ${plugin.version}" />
27-
<echo message="CVS-Tag: ${tag}" />
28-
<echo message="BUILD : ${build.number}" />
29-
<echo message="JAVA : ${java.version}" />
26+
<echo message="VERSION: ${plugin.version}" />
27+
<echo message="CVS-Tag: ${tag}" />
28+
<echo message="BUILD : ${build.number}" />
29+
<echo message="JAVA : ${java.version}" />
3030

3131
<property name="define.jarfilename" value="${plugin.name}.jar" />
3232
<property name="define.zipfilename" value="${plugin.name}.zip" />
@@ -44,22 +44,22 @@
4444
<property name="lib.dir" value="lib" />
4545
<property name="class.dir" value="${project.tmp}/bin" />
4646
<property name="help.dir" value="${src.dir}/help" />
47-
47+
4848

4949
<available file="${lib.dir}" type="dir" property="havelib" />
5050

5151
<path id="compilepath">
5252
<pathelement path="${define.compilepath}" />
53-
<fileset dir="." >
54-
<include name="${lib.dir}/**/*.jar" if="havelib"/>
55-
</fileset>
56-
<fileset dir="${define.htmlunit.dir}/lib" >
57-
<include name="**/*.jar" />
58-
</fileset>
59-
<fileset dir="${define.jameica.dir}/lib/" >
60-
<include name="**/*.jar" />
61-
</fileset>
62-
53+
<fileset dir="." >
54+
<include name="${lib.dir}/**/*.jar" if="havelib"/>
55+
</fileset>
56+
<fileset dir="${define.htmlunit.dir}/lib" >
57+
<include name="**/*.jar" />
58+
</fileset>
59+
<fileset dir="${define.jameica.dir}/lib/" >
60+
<include name="**/*.jar" />
61+
</fileset>
62+
6363

6464
</path>
6565

@@ -89,15 +89,18 @@
8989

9090
<copy todir="${class.dir}">
9191
<fileset dir="${src.dir}">
92-
<include name="META-INF/**" />
93-
</fileset>
92+
<include name="META-INF/**" />
93+
</fileset>
9494
</copy>
95-
96-
<copy todir="${class.dir}/help">
97-
<fileset dir="${help.dir}" />
98-
</copy>
9995

100-
</target>
96+
<copy todir="${class.dir}/help">
97+
<fileset dir="${help.dir}" />
98+
</copy>
99+
<copy todir="${class.dir}/img">
100+
<fileset dir="${img.dir}" />
101+
</copy>
102+
103+
</target>
101104

102105

103106

@@ -125,14 +128,14 @@
125128
<attribute name="Implementation-Title" value="${plugin.name}" />
126129
<attribute name="Implementation-Version" value="${plugin.version}" />
127130
<attribute name="Implementation-Buildnumber" value="${build.number}" />
128-
<attribute name="Class-Path" value="lang help lib" />
129-
</manifest>
131+
<attribute name="Class-Path" value="lang help lib" />
132+
</manifest>
130133
<fileset dir="${class.dir}" />
131134
</jar>
132135

133-
<antcall target="addlib"/>
136+
<antcall target="addlib"/>
134137

135-
<copy file="plugin.xml" todir="${project.zipdir}" />
138+
<copy file="plugin.xml" todir="${project.zipdir}" />
136139

137140
<!-- create zip file -->
138141
<zip destfile="${project.release}/${define.zipfilename}">
@@ -152,7 +155,7 @@
152155
<fileset dir=".">
153156
<include name=".project" />
154157
<include name=".classpath" />
155-
<include name="plugin.xml" />
158+
<include name="plugin.xml" />
156159
<include name="${lib.dir}/**" />
157160
<include name="${src.dir}/**" />
158161
<include name="${build.dir}/**" />

0 commit comments

Comments
 (0)