java/icedtea-web: Remove port
Desktop-focused software not aligned with server objectives
This commit is contained in:
@@ -3977,6 +3977,7 @@ java/eclipse-findbugs
|
||||
java/eclipse-pydev
|
||||
java/eclipse-shelled
|
||||
java/eclipse-yaml-editor
|
||||
java/icedtea-web
|
||||
java/java3d
|
||||
java/jdk11-doc
|
||||
java/jdk8-doc
|
||||
|
||||
@@ -1,168 +0,0 @@
|
||||
# Documentation and examples:
|
||||
#
|
||||
# Feature: webplugin
|
||||
# Usage: USES=webplugin or USES=webplugin:ARGS
|
||||
# Valid ARGS: gecko: Support geko based plugings
|
||||
# native: Support gecko, opera, webkit-gtk*
|
||||
# [list of indivudual engines]: specify browsers to use
|
||||
# all: All browser (implicit, default)
|
||||
#
|
||||
# USES=webplugin will create symlinks automatically for each supported
|
||||
# application that supports the webplugin framework. Also, it will remove
|
||||
# these symlinks when the plug-in port is uninstalled.
|
||||
#
|
||||
# WEBPLUGIN_NAME - If your port installs files in ${WEBPLUGIN_DIR},
|
||||
# then you can tweak WEBPLUGIN_NAME to change the
|
||||
# name of the directory
|
||||
# (lib/browser_plugins/symlinks/WEBPLUGIN_NAME).
|
||||
# Default: WEBPLUGIN_NAME=${PKGBASE}
|
||||
#
|
||||
# WEBPLUGIN_FILES - The plug-in files that are going to be linked
|
||||
# in lib/browser_plugins/symlinks/*/. It cannot
|
||||
# be empty or the port will set IGNORE.
|
||||
#
|
||||
# WEBPLUGIN_DIR - The directory where the plug-in file(s) can be
|
||||
# found. Each plug-in file in WEBPLUGIN_FILES
|
||||
# must be found in WEBPLUGIN_DIR. If your port
|
||||
# does not install in WEBPLUGIN_DIR, but in its own
|
||||
# path, you will need to specify that here or
|
||||
# symlinks will be created to non-existent files.
|
||||
# Default: WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
|
||||
#
|
||||
# Makefile:
|
||||
# ------------------------------------------------------
|
||||
# USES= webplugin:gecko
|
||||
# [...]
|
||||
# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi
|
||||
#
|
||||
# post-install:
|
||||
# ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
|
||||
# ${INSTALL_DATA} ${WEBPLUGIN_FILES:S,^,${WRKSRC}/plugins/,} \
|
||||
# ${STAGEDIR}${WEBPLUGIN_DIR}
|
||||
#
|
||||
# .include <bsd.port.mk>
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks
|
||||
# in pkg-plist, because they will be removed automatically.
|
||||
#
|
||||
# pkg-plist:
|
||||
# ------------------------------------------------------
|
||||
# [...]
|
||||
# %%WEBPLUGIN_DIR%%/fooplugin.so
|
||||
# %%WEBPLUGIN_DIR%%/fooplugin.xpi
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# Here is what it will look like when it creates the symlinks:
|
||||
#
|
||||
# ------------------------------------------------------
|
||||
# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so
|
||||
# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# If your port uses libtool, and installs any *.a and *.la files, do not add
|
||||
# these files to WEBPLUGIN_FILES. WEBPLUGIN_FILES should be *.so or/and
|
||||
# *.xpi ONLY.
|
||||
#
|
||||
# Example to add in Makefile and pkg-plist if your port installs plug-ins in
|
||||
# its own directory, and you need to set WEBPLUGIN_DIR.
|
||||
#
|
||||
# Makefile:
|
||||
# ------------------------------------------------------
|
||||
# [...]
|
||||
# USES= webplugin:gecko
|
||||
# WEBPLUGIN_DIR=${PREFIX}/lib/application
|
||||
# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi
|
||||
#
|
||||
# [...]
|
||||
#
|
||||
# .include <bsd.port.mk>
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# As for the pkg-plist, it should only include the actual files your
|
||||
# port installs:
|
||||
#
|
||||
# pkg-plist:
|
||||
# ------------------------------------------------------
|
||||
# [...]
|
||||
# lib/application/fooplugin.a
|
||||
# lib/application/fooplugin.la
|
||||
# lib/application/fooplugin.so
|
||||
# lib/application/fooplugin.xpi
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# Here is what it will look like when it creates symlinks:
|
||||
#
|
||||
# ------------------------------------------------------
|
||||
# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so
|
||||
# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# MAINTAINER= gecko@FreeBSD.org
|
||||
|
||||
.if !defined(_INCLUDE_USES_WEBPLUGIN_MK)
|
||||
_INCLUDE_USES_WEBPLUGIN_MK= yes
|
||||
|
||||
WEBPLUGIN_NAME?= ${PKGBASE}
|
||||
_WEBPLUGIN_APPS_ALL_NATIVE= gecko opera opera-devel webkit-gtk2
|
||||
_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_NATIVE}
|
||||
|
||||
_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL}
|
||||
. if ${webplugin_ARGS} == all || empty(webplugin_ARGS)
|
||||
_WEBPLUGIN_PATTERN= *
|
||||
. elif ${webplugin_ARGS} == native
|
||||
_WEBPLUGIN_PATTERN= *
|
||||
_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE}
|
||||
. else
|
||||
_WEBPLUGIN_PATTERN= ${webplugin_ARGS}
|
||||
. endif
|
||||
|
||||
. if !defined(WEBPLUGIN_FILES)
|
||||
IGNORE= Cannot be installed: WEBPLUGIN_FILES is empty. Please, add plug-in files to it
|
||||
. endif
|
||||
|
||||
. for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL}
|
||||
_TEMP_APP_=${_TEMP_APP__}
|
||||
_TEMP_FLAG_=0
|
||||
. for _TEMP_USE__ in ${USE_webplugin}
|
||||
_TEMP_USE_=${_TEMP_USE__}
|
||||
. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \
|
||||
( ${_TEMP_USE_:Mnative} )
|
||||
_TEMP_FLAG_=1
|
||||
. endif
|
||||
. endfor
|
||||
. if ${_TEMP_FLAG_}
|
||||
USE_WEBPLUGIN_EXP+= ${_TEMP_APP__}
|
||||
. endif
|
||||
. endfor
|
||||
|
||||
. for p in ${_WEBPLUGIN_PATTERN}
|
||||
_WEBPLUGIN_MATCHED+= ${_WEBPLUGIN_TEST:M${p}}
|
||||
. endfor
|
||||
|
||||
_WEBPLUGIN_LIBDIR= ${LOCALBASE}/lib/browser_plugins
|
||||
_WEBPLUGIN_SLDIR= ${_WEBPLUGIN_LIBDIR}/symlinks
|
||||
|
||||
_WEBPLUGIN_SLDIRS= ${_WEBPLUGIN_MATCHED:S.^.${_WEBPLUGIN_SLDIR}/.}
|
||||
|
||||
_WEBPLUGIN_APPS= ${USE_WEBPLUGIN_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*}
|
||||
_WEBPLUGIN_LINKFARMS= ${_WEBPLUGIN_APPS} ${_WEBPLUGIN_SLDIRS}
|
||||
|
||||
WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
|
||||
|
||||
PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
|
||||
. for d in ${_WEBPLUGIN_LINKFARMS}
|
||||
. for l in ${WEBPLUGIN_FILES}
|
||||
PLIST_FILES+= ${d}/${l}
|
||||
. endfor
|
||||
. endfor
|
||||
|
||||
_USES_install+= 600:webplugin-post-install
|
||||
webplugin-post-install:
|
||||
. for d in ${_WEBPLUGIN_LINKFARMS}
|
||||
${MKDIR} ${STAGEDIR}${d}
|
||||
. for l in ${WEBPLUGIN_FILES}
|
||||
${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/
|
||||
. endfor
|
||||
. endfor
|
||||
.endif
|
||||
@@ -22,7 +22,6 @@
|
||||
SUBDIR += bouncycastle
|
||||
SUBDIR += dbvis
|
||||
SUBDIR += hamcrest
|
||||
SUBDIR += icedtea-web
|
||||
SUBDIR += intellij
|
||||
SUBDIR += intellij-fsnotifier
|
||||
SUBDIR += intellij-pty4j
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
PORTNAME= icedtea-web
|
||||
PORTVERSION= 1.8.8
|
||||
DISTVERSIONPREFIX= icedtea-web-
|
||||
PORTREVISION= 25
|
||||
CATEGORIES= java www
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT= Free Java plug-in and Java Web Start for OpenJDK
|
||||
WWW= http://icedtea.classpath.org/wiki/IcedTea-Web
|
||||
|
||||
LICENSE= GPLv2
|
||||
|
||||
BUILD_DEPENDS= zip:archivers/zip \
|
||||
bash:shells/bash \
|
||||
gsed:textproc/gsed \
|
||||
${HAMCREST_JAR}:java/hamcrest \
|
||||
${JUNIT_JAR}:java/junit
|
||||
RUN_DEPENDS= bash:shells/bash
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
|
||||
USES= autoreconf compiler:c++11-lang desktop-file-utils gmake java \
|
||||
pkgconfig shebangfix xorg
|
||||
JAVA_VERSION= 8
|
||||
JAVA_OS= native
|
||||
JAVA_VENDOR= openjdk
|
||||
USE_XORG= x11
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= AdoptOpenJDK
|
||||
GH_PROJECT= IcedTea-Web
|
||||
SHEBANG_FILES= jrunscript.in shell-launcher/launchers.sh.in
|
||||
|
||||
CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
|
||||
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
|
||||
CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"
|
||||
CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"
|
||||
CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"
|
||||
CONFIGURE_ARGS+= --with-itw-libs="DISTRIBUTION"
|
||||
CONFIGURE_ARGS+= --enable-shell-launchers
|
||||
.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
|
||||
CONFIGURE_ARGS+= --without-${opt}
|
||||
.endfor
|
||||
CONFIGURE_ENV= BIN_BASH=${bash_CMD}
|
||||
CONFIGURE_ENV+= bashcompdir=${PREFIX}/etc/bash_completion.d
|
||||
CONFIGURE_SHELL= ${bash_CMD}
|
||||
|
||||
TEST_TARGET= check
|
||||
|
||||
# Upstream archive contains files with UTF-8 names
|
||||
EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
|
||||
|
||||
OPTIONS_DEFINE= DOCS PLUGIN PLUGINJAR RHINO RUST TAGSOUP
|
||||
OPTIONS_DEFAULT=PLUGINJAR RUST
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
PLUGIN_DESC= Enable the browser plug-in
|
||||
PLUGINJAR_DESC= Enable plugin.jar for itweb-javaws -html
|
||||
RHINO_DESC= Add support for Proxy Auto Config files
|
||||
RUST_DESC= Build modern launchers written in Rust
|
||||
TAGSOUP_DESC= Enable cleaning up of malformed JNLP files
|
||||
|
||||
DOCS_CONFIGURE_ENABLE= docs
|
||||
DOCS_PORTDOCS= netx
|
||||
|
||||
RHINO_BUILD_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:lang/rhino
|
||||
RHINO_RUN_DEPENDS= ${RHINO_BUILD_DEPENDS}
|
||||
RHINO_VARS= RHINO_JAR="${JAVASHAREDIR}/rhino/rhino.jar"
|
||||
RHINO_VARS_OFF= RHINO_JAR=no
|
||||
|
||||
RUST_BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT}
|
||||
|
||||
TAGSOUP_BUILD_DEPENDS= ${JAVALIBDIR}/tagsoup.jar:textproc/tagsoup
|
||||
TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS}
|
||||
TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
|
||||
TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
|
||||
|
||||
PLUGIN_CONFIGURE_ENABLE=native-plugin
|
||||
PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
|
||||
MOZILLA_LIBS=" " # needs to be set and non-empty!
|
||||
PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi
|
||||
PLUGIN_MASTER_SITES= LOCAL/tobik:npapi
|
||||
PLUGIN_TEST_TARGET= plugin-tests
|
||||
PLUGIN_USE= GNOME=glib20
|
||||
PLUGIN_USES= webplugin:native gnome
|
||||
PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib \
|
||||
WEBPLUGIN_FILES=IcedTeaPlugin.so
|
||||
PLUGIN_IMPLIES= PLUGINJAR
|
||||
|
||||
PLUGINJAR_CONFIGURE_ENABLE= pluginjar
|
||||
PLUGINJAR_PORTDOCS= plugin
|
||||
|
||||
HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar
|
||||
JUNIT_JAR= ${JAVALIBDIR}/junit.jar
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
post-patch:
|
||||
${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \
|
||||
-e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \
|
||||
${WRKSRC}/Makefile.am ${WRKSRC}/html-gen.sh
|
||||
${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
|
||||
${WRKSRC}/*.desktop.in
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR}
|
||||
.for lang in cs de en pl
|
||||
.for man in javaws policyeditor
|
||||
${MV} ${STAGEDIR}${PREFIX}/share/man/${lang:Nen}/man1/${man}.1 \
|
||||
${STAGEDIR}${PREFIX}/share/man/${lang:Nen}/man1/itweb-${man}.1
|
||||
.endfor
|
||||
.endfor
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "Run \"make test\" to execute regression test."
|
||||
@${ECHO_MSG}
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
@@ -1,5 +0,0 @@
|
||||
TIMESTAMP = 1639151286
|
||||
SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = f4203a605a3c9c50acdcc6eef4a366b9fdd36d95edcd76bcbfede01107cb5fe6
|
||||
SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = 2365638
|
||||
SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8
|
||||
SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637
|
||||
@@ -1,171 +0,0 @@
|
||||
--- Makefile.am.orig 2021-05-17 09:24:37 UTC
|
||||
+++ Makefile.am
|
||||
@@ -336,9 +336,9 @@ export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200
|
||||
#end of exported autoconf copies
|
||||
|
||||
# binary names
|
||||
-javaws:= $(shell echo javaws | sed '@program_transform_name@')
|
||||
+javaws:= $(shell echo itweb-javaws | sed '@program_transform_name@')
|
||||
itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@')
|
||||
-policyeditor:= $(shell echo policyeditor | sed '@program_transform_name@')
|
||||
+policyeditor:= $(shell echo itweb-policyeditor | sed '@program_transform_name@')
|
||||
|
||||
if WINDOWS_OR_INCLUDE_BATS
|
||||
# convert Unix newlines (LF) to DOS format:
|
||||
@@ -398,7 +398,7 @@ if ENABLE_PLUGINJAR
|
||||
endif
|
||||
${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
|
||||
${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
|
||||
- ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/
|
||||
+ ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/itweb-javaws.png
|
||||
mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
|
||||
cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
|
||||
if ENABLE_NATIVE_LAUNCHERS
|
||||
@@ -407,9 +407,9 @@ if ENABLE_NATIVE_LAUNCHERS
|
||||
${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
|
||||
endif
|
||||
if ENABLE_SHELL_LAUNCHERS
|
||||
- ${INSTALL_PROGRAM} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
|
||||
- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
|
||||
- ${INSTALL_PROGRAM} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
|
||||
+ ${INSTALL_SCRIPT} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
|
||||
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
|
||||
+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
|
||||
if WINDOWS_OR_INCLUDE_BATS
|
||||
${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
|
||||
${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
|
||||
@@ -431,13 +431,15 @@ if ENABLE_DOCS
|
||||
(cd ${TOP_BUILD_DIR}/docs/netx; \
|
||||
for files in $$(find . -type f); \
|
||||
do \
|
||||
- ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
|
||||
+ mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
|
||||
+ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
|
||||
done)
|
||||
if ENABLE_PLUGINJAR
|
||||
(cd ${TOP_BUILD_DIR}/docs/plugin; \
|
||||
for files in $$(find . -type f); \
|
||||
do \
|
||||
- ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
|
||||
+ mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
|
||||
+ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
|
||||
done)
|
||||
endif
|
||||
endif
|
||||
@@ -571,7 +573,7 @@ remove-empty-linux-only-dirs:
|
||||
# all generated manpages must be removed one by one
|
||||
# shell (only shell!) launchers must go away
|
||||
uninstall-linux-only:
|
||||
- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
|
||||
+ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
|
||||
KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
|
||||
for file in $$KNOWN_MANS ; do \
|
||||
for dir in $$KNOWN_DIRS ; do \
|
||||
@@ -901,7 +903,7 @@ stamps/generate-docs.stamp: stamps/netx.stamp
|
||||
echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
|
||||
for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
|
||||
ID=`echo "$$LANG_ID" | head -c 2` ; \
|
||||
- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \
|
||||
+ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
|
||||
export LANG=$$LANG_ID; \
|
||||
mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
|
||||
echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
|
||||
@@ -943,7 +945,8 @@ stamps/netx.stamp: netx-source-files.txt stamps/netx-h
|
||||
(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 $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
|
||||
@@ -973,9 +976,9 @@ clean-netx:
|
||||
rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
|
||||
|
||||
clean-desktop-files:
|
||||
- rm -f javaws.desktop
|
||||
+ rm -f itweb-javaws.desktop
|
||||
rm -f itweb-settings.desktop
|
||||
- rm -f policyeditor.desktop
|
||||
+ rm -f itweb-policyeditor.desktop
|
||||
|
||||
|
||||
# launcher run args:
|
||||
@@ -1156,7 +1159,7 @@ endif
|
||||
fi
|
||||
|
||||
javaws.desktop: javaws.desktop.in
|
||||
- sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
|
||||
+ sed "s#PATH_TO_JAVAWS#$(bindir)/$(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)#" \
|
||||
@@ -1164,7 +1167,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.deskt
|
||||
|
||||
policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
|
||||
sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \
|
||||
- < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
|
||||
+ < $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
|
||||
|
||||
# documentation
|
||||
|
||||
@@ -1304,7 +1307,7 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stam
|
||||
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
|
||||
$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar\$(CLASSPATH_SEPARATOR)$(TOP_BUILD_DIR)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
|
||||
if [ -n "$$notSrcFiles" ] ; then \
|
||||
- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
|
||||
+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
|
||||
fi ; \
|
||||
cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
|
||||
if [ -f $(META_MANIFEST) ]; \
|
||||
@@ -1372,7 +1375,7 @@ stamps/change-dots-to-paths.stamp: stamps/netx-dist-te
|
||||
path="`dirname $$slashed_dir`" ; \
|
||||
file="`basename $$slashed_dir`.jar" ; \
|
||||
echo "copying $$dir.jar to $$path as $$file" ; \
|
||||
- mkdir --parents $$path ; \
|
||||
+ mkdir -p $$path ; \
|
||||
cp $$dir".jar" "$$path"/"$$file" ; \
|
||||
fi ; \
|
||||
done ; \
|
||||
@@ -1518,7 +1521,7 @@ $(REPRODUCERS_CLASS_NAMES):
|
||||
whiteListed=$(RUN_WHITELIST_FILTER); \
|
||||
cd $(TEST_EXTENSIONS_TESTS_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' ` ; \
|
||||
INCLUDE="NO" ; \
|
||||
@@ -1707,7 +1710,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
|
||||
$(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" ; \
|
||||
@@ -1718,10 +1721,7 @@ stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tes
|
||||
$(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="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \
|
||||
@@ -2045,9 +2045,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/
|
||||
$(PLUGIN_TEST_SRCS) ;
|
||||
$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
|
||||
plugin/tests/LiveConnect/*.class ;
|
||||
- cp -pPR $(SRC_DIR_LINK) $(TOP_SRC_DIR)/plugin/tests/LiveConnect/*.{js,html} \
|
||||
- plugin/tests/LiveConnect ;
|
||||
- echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
|
||||
+ @echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
|
||||
mkdir -p stamps
|
||||
touch stamps/plugin-tests.stamp
|
||||
endif
|
||||
@@ -1,8 +0,0 @@
|
||||
--- completion/javaws.bash.in.orig 2021-05-17 09:24:37 UTC
|
||||
+++ completion/javaws.bash.in
|
||||
@@ -28,4 +28,4 @@ _javaws()
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
-complete -F _javaws javaws
|
||||
+complete -F _javaws itweb-javaws
|
||||
@@ -1,8 +0,0 @@
|
||||
--- completion/policyeditor.bash.in.orig 2021-05-17 09:24:37 UTC
|
||||
+++ completion/policyeditor.bash.in
|
||||
@@ -10,4 +10,4 @@ _policyeditor()
|
||||
COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
|
||||
return 0
|
||||
}
|
||||
-complete -F _policyeditor policyeditor
|
||||
+complete -F _policyeditor itweb-policyeditor
|
||||
@@ -1,20 +0,0 @@
|
||||
--- html-gen.sh.orig 2021-05-17 09:24:37 UTC
|
||||
+++ html-gen.sh
|
||||
@@ -74,7 +74,7 @@ else
|
||||
unset REPO_URL
|
||||
fi
|
||||
|
||||
-start_time="$(date +%s.%N)"
|
||||
+start_time="$(date +%s)"
|
||||
|
||||
if [ ! -e html-gen ]; then
|
||||
echo "No html-gen directory, exiting. See Makefile.am for usage"
|
||||
@@ -170,7 +170,7 @@ done
|
||||
|
||||
sed -i -r 's|(\*\ .*):|<u>\1</u>:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"
|
||||
|
||||
-end_time="$(date +%s.%N)"
|
||||
+end_time="$(date +%s)"
|
||||
|
||||
print_debug "HTML generation complete"
|
||||
print_debug "Total elapsed time: $(echo "$end_time - $start_time" | bc )"
|
||||
@@ -1,26 +0,0 @@
|
||||
--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2021-05-17 09:24:37 UTC
|
||||
+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
|
||||
@@ -86,7 +86,7 @@ import net.sourceforge.jnlp.security.dialogresults.Acc
|
||||
|
||||
public class XDesktopEntry implements GenericDesktopEntry {
|
||||
|
||||
- public static final String JAVA_ICON_NAME = "javaws";
|
||||
+ public static final String JAVA_ICON_NAME = "itweb-javaws";
|
||||
|
||||
private JNLPFile file = null;
|
||||
private int iconSize = -1;
|
||||
@@ -219,12 +219,12 @@ public class XDesktopEntry implements GenericDesktopEn
|
||||
if (exec != null) {
|
||||
return exec;
|
||||
}
|
||||
- String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});
|
||||
+ String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});
|
||||
if (pathResult != null) {
|
||||
return pathResult;
|
||||
}
|
||||
|
||||
- return "javaws";
|
||||
+ return "itweb-javaws";
|
||||
}
|
||||
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2021-05-17 09:24:37 UTC
|
||||
+++ plugin/icedteanp/IcedTeaNPPlugin.cc
|
||||
@@ -1627,9 +1627,9 @@ plugin_start_appletviewer (ITNPPluginData* data)
|
||||
command_line.push_back("-classpath");
|
||||
command_line.push_back(get_plugin_jfx_jar());
|
||||
command_line.push_back("--patch-module");
|
||||
- command_line.push_back("java.desktop="PLUGIN_JAR":"NETX_JAR);
|
||||
+ command_line.push_back("java.desktop=" PLUGIN_JAR":" NETX_JAR);
|
||||
command_line.push_back("--patch-module");
|
||||
- command_line.push_back("jdk.jsobject="JSOBJECT_JAR);
|
||||
+ command_line.push_back("jdk.jsobject=" JSOBJECT_JAR);
|
||||
command_line.push_back("--add-reads");
|
||||
command_line.push_back("java.base=ALL-UNNAMED,java.desktop");
|
||||
command_line.push_back("--add-reads");
|
||||
@@ -1,11 +0,0 @@
|
||||
--- plugin/icedteanp/IcedTeaPluginUtils.cc.orig 2016-02-03 13:47:43 UTC
|
||||
+++ plugin/icedteanp/IcedTeaPluginUtils.cc
|
||||
@@ -1017,7 +1017,7 @@ NPString IcedTeaPluginUtilities::NPStringCopy(const st
|
||||
char* utf8 = (char*)browser_functions.memalloc(result.size() + 1);
|
||||
strncpy(utf8, result.c_str(), result.size() + 1);
|
||||
|
||||
- NPString npstr = {utf8, result.size()};
|
||||
+ NPString npstr = {utf8, (uint32_t)result.size()};
|
||||
return npstr;
|
||||
}
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- rust-launcher/Cargo.toml.orig 2021-05-17 09:24:37 UTC
|
||||
+++ rust-launcher/Cargo.toml
|
||||
@@ -2,7 +2,3 @@
|
||||
name = "launcher"
|
||||
version = "1.8.0"
|
||||
authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"]
|
||||
-
|
||||
-[dependencies]
|
||||
-[target.'cfg(windows)'.dependencies]
|
||||
-dunce = "0.1.1"
|
||||
@@ -1,3 +0,0 @@
|
||||
The IcedTea-Web project provides a Free Software web browser plugin running
|
||||
applets written in the Java programming language and an implementation of
|
||||
Java Web Start, originally based on the NetX project.
|
||||
@@ -1,39 +0,0 @@
|
||||
bin/itw-modularjdk.args
|
||||
%%RUST%%bin/itweb-javaws
|
||||
bin/itweb-javaws.sh
|
||||
%%RUST%%bin/itweb-policyeditor
|
||||
bin/itweb-policyeditor.sh
|
||||
%%RUST%%bin/itweb-settings
|
||||
bin/itweb-settings.sh
|
||||
%%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
|
||||
etc/bash_completion.d/itweb-settings.bash
|
||||
etc/bash_completion.d/javaws.bash
|
||||
etc/bash_completion.d/policyeditor.bash
|
||||
share/man/cs/man1/icedtea-web-plugin.1.gz
|
||||
share/man/cs/man1/icedtea-web.1.gz
|
||||
share/man/cs/man1/itweb-javaws.1.gz
|
||||
share/man/cs/man1/itweb-policyeditor.1.gz
|
||||
share/man/cs/man1/itweb-settings.1.gz
|
||||
share/man/de/man1/icedtea-web-plugin.1.gz
|
||||
share/man/de/man1/icedtea-web.1.gz
|
||||
share/man/de/man1/itweb-javaws.1.gz
|
||||
share/man/de/man1/itweb-policyeditor.1.gz
|
||||
share/man/de/man1/itweb-settings.1.gz
|
||||
share/man/man1/icedtea-web-plugin.1.gz
|
||||
share/man/man1/icedtea-web.1.gz
|
||||
share/man/man1/itweb-javaws.1.gz
|
||||
share/man/man1/itweb-policyeditor.1.gz
|
||||
share/man/man1/itweb-settings.1.gz
|
||||
share/man/pl/man1/icedtea-web-plugin.1.gz
|
||||
share/man/pl/man1/icedtea-web.1.gz
|
||||
share/man/pl/man1/itweb-javaws.1.gz
|
||||
share/man/pl/man1/itweb-policyeditor.1.gz
|
||||
share/man/pl/man1/itweb-settings.1.gz
|
||||
share/applications/itweb-javaws.desktop
|
||||
share/applications/itweb-policyeditor.desktop
|
||||
share/applications/itweb-settings.desktop
|
||||
%%DATADIR%%/javaws.jar
|
||||
%%DATADIR%%/javaws_splash.png
|
||||
%%PLUGINJAR%%%%DATADIR%%/jsobject.jar
|
||||
%%PLUGINJAR%%%%DATADIR%%/plugin.jar
|
||||
share/pixmaps/itweb-javaws.png
|
||||
Reference in New Issue
Block a user