1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
--- Makefile.in.orig 2012-03-05 12:06:46.333970000 -0500
+++ Makefile.in 2012-03-05 18:07:03.000000000 -0500
@@ -292,14 +292,14 @@
# binary names
-javaws := $(shell echo javaws | sed '@program_transform_name@')
+itweb_javaws := $(shell echo itweb-javaws | sed '@program_transform_name@')
itweb_settings := $(shell echo itweb-settings | sed '@program_transform_name@')
# the launcher needs to know $(bindir) and $(datadir) which can be different at
# make-time from configure-time
edit_launcher_script = sed \
-e 's|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g' \
- -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
+ -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(itweb_javaws)|g' \
-e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
-e 's|[@]JAVA[@]|$(JAVA)|g' \
-e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
@@ -638,8 +638,8 @@
# Top-Level Targets
# =================
-all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
- javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop
+all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(itweb_javaws) \
+ itweb-javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop
check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
@@ -659,24 +659,26 @@
@ENABLE_PLUGIN_TRUE@ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir)
@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_javaws) $(DESTDIR)$(bindir)
${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
install-data-local:
${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1/itweb-javaws.1
${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
@ENABLE_DOCS_TRUE@ ${mkinstalldirs} $(DESTDIR)$(htmldir)
@ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \
@ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@ do \
-@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
+@ENABLE_DOCS_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
+@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
@ENABLE_DOCS_TRUE@ done)
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ (cd ${abs_top_builddir}/docs/plugin; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ do \
-@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done)
uninstall-local:
@@ -685,8 +687,8 @@
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
- rm -f $(DESTDIR)$(mandir)/man1/javaws.1
- rm -f $(DESTDIR)$(bindir)/$(javaws)
+ rm -f $(DESTDIR)$(mandir)/man1/itweb-javaws.1
+ rm -f $(DESTDIR)$(bindir)/$(itweb_javaws)
rm -f $(DESTDIR)$(bindir)/$(itweb_settings)
rm -rf $(DESTDIR)$(htmldir)
@@ -776,7 +778,7 @@
netx-source-files.txt:
find $(NETX_SRCDIR) -name '*.java' | sort > $@
-@WITH_RHINO_FALSE@ sed -i '/RhinoBasedPacEvaluator/ d' $@
+@WITH_RHINO_FALSE@ sed -i -e '/RhinoBasedPacEvaluator/ d' $@
stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
mkdir -p $(NETX_DIR)
@@ -788,7 +790,8 @@
(cd $(NETX_RESOURCE_DIR); \
for files in $$(find . -type f); \
do \
- ${INSTALL_DATA} -D $${files} \
+ mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
+ ${INSTALL_DATA} $${files} \
$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
done)
cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -816,10 +819,10 @@
rm -f stamps/netx.stamp
clean-desktop-files:
- rm -f javaws.desktop
+ rm -f itweb-javaws.desktop
rm -f itweb-settings.desktop
-# extras -- used to create about.jar for javaws.
+# extras -- used to create about.jar for itweb-javaws.
extra-source-files.txt:
find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
@@ -831,7 +834,8 @@
(cd $(NETX_EXTRA_DIR); \
for files in $$(find . -type f); \
do \
- ${INSTALL_DATA} -D $${files} \
+ mkdir -p `dirname $(NETX_EXTRA_DIST_DIR)/$${files}`; \
+ ${INSTALL_DATA} $${files} \
$(NETX_EXTRA_DIST_DIR)/$${files}; \
done)
mkdir -p stamps
@@ -845,7 +849,7 @@
extra-lib/about.jar: stamps/extra-class-files.stamp
$(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
-launcher.build/$(javaws): launcher/javaws.in
+launcher.build/$(itweb_javaws): launcher/javaws.in
mkdir -p launcher.build
$(edit_launcher_script) < $< > $@
@@ -854,14 +858,14 @@
$(edit_launcher_script) < $< > $@
clean-launchers:
- rm -f launcher.build/$(javaws)
+ rm -f launcher.build/$(itweb_javaws)
rm -f launcher.build/$(itweb_settings)
if [ -e launcher.build ] ; then \
rmdir launcher.build ; \
fi
-javaws.desktop: javaws.desktop.in
- sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
+itweb-javaws.desktop: javaws.desktop.in
+ sed "s#PATH_TO_JAVAWS#$(bindir)/$(itweb_javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
@@ -915,8 +919,8 @@
fi
check-pac-functions: stamps/bootstrap-directory.stamp
- ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
- $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
+ $(SHELL) jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
+ $$(realpath $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
junit-runner-source-files.txt:
find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
@@ -958,7 +962,7 @@
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
$(BOOT_DIR)/bin/javac -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents "$$notSrcFiles" "$(JNLP_TESTS_DIR)/$$dir/" ; \
+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(JNLP_TESTS_DIR)/$$dir/" ; \
fi ; \
cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
$(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
@@ -1015,7 +1019,7 @@
$(REPRODUCERS_CLASS_NAMES):
cd $(JNLP_TESTS_ENGINE_DIR) ; \
class_names= ; \
- for test in `find -type f` ; do \
+ for test in `find . -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
class_names="$$class_names $$class_name" ; \
@@ -1059,7 +1063,7 @@
$(UNIT_CLASS_NAMES):
cd $(NETX_UNIT_TEST_DIR) ; \
class_names= ; \
- for test in `find -type f` ; do \
+ for test in `find . -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
class_names="$$class_names $$class_name" ; \
@@ -1070,10 +1074,7 @@
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
filename=" " ; \
cd $(NETX_UNIT_TEST_SRCDIR) ; \
- for file in `find . -type f \! -iname "*.java"`; do\
- filename=`echo $$file `; \
- cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
- done ; \
+ tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
@@ -1302,9 +1303,7 @@
@ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ;
@ENABLE_PLUGIN_TRUE@ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
-@ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ;
-@ENABLE_PLUGIN_TRUE@ echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
+@ENABLE_PLUGIN_TRUE@ echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
@ENABLE_PLUGIN_TRUE@ mkdir -p stamps
@ENABLE_PLUGIN_TRUE@ touch stamps/plugin-tests.stamp
|
