Author: nextgens
Date: 2007-05-24 22:29:06 +0000 (Thu, 24 May 2007)
New Revision: 13363
Modified:
trunk/apps/new_installer/ProcessPanel.Spec.xml
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/langpacks/fra.xml
trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
Log:
new_installer: bundle UPnP
Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml 2007-05-24 21:55:25 UTC
(rev 13362)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml 2007-05-24 22:29:06 UTC
(rev 13363)
@@ -42,6 +42,14 @@
<os family="mac"/>
<executefile name="$INSTALL_PATH/bin/install_stun.sh"/>
</job>
+ <job name="Setting UPnP up">
+ <os family="unix"/>
+ <executefile name="$INSTALL_PATH/bin/install_upnp.sh"/>
+ </job>
+ <job name="Setting UPnP up">
+ <os family="mac"/>
+ <executefile name="$INSTALL_PATH/bin/install_upnp.sh"/>
+ </job>
<job name="Setting Librarian up">
<os family="unix"/>
<executefile name="$INSTALL_PATH/bin/install_librarian.sh"/>
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2007-05-24 21:55:25 UTC (rev
13362)
+++ trunk/apps/new_installer/install.xml 2007-05-24 22:29:06 UTC (rev
13363)
@@ -182,6 +182,7 @@
<parsable
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
+ <parsable
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
@@ -217,6 +218,7 @@
<parsable
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
+ <parsable
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
@@ -236,6 +238,11 @@
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/update"/>
</pack>
+ <pack name="UPnP" id="upnp" required="no">
+ <description>A plugin enabling the node to use
Universal Plug and Play to determine your external internet address and set up
port forwarding on your router. Note that this involves contacting your default
gateway and may be a security risk on an untrusted LAN, however it improves
connectivity significantly.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/upnp"/>
+ </pack>
+
<pack name="STUN" id="stun" required="no">
<description>A plugin enabling the node to use STUN to
determine your external internet address. Note that this involves contacting an
external server so may be a security risk, however it improves connectivity
significantly for nodes behind a router with dynamical IP addresses (i.e. most
nodes).</description>
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/stun"/>
Modified: trunk/apps/new_installer/langpacks/fra.xml
===================================================================
--- trunk/apps/new_installer/langpacks/fra.xml 2007-05-24 21:55:25 UTC (rev
13362)
+++ trunk/apps/new_installer/langpacks/fra.xml 2007-05-24 22:29:06 UTC (rev
13363)
@@ -79,6 +79,7 @@
<str id="uninstall.description" txt="Un pack permettant de configurer
l'outil de d?sinstallation."/>
<str id="autoupdater.description" txt="Un pack permettant au noeud de se
tenir ? jour automatiquement via freenet. Il est conseill? de l'installer."/>
<str id="stun.description" txt="Un pack permettant d'installer le plugin
STUN pour freenet. STUN est le protocole permettant ? freenet de d?couvrir
dynamiquement quel est votre type de connexion internet. Ce protocole utilise
un serveur tiers pour officier, ce qui peut etre consid?r? comme un risque de
s?curit?. Nous recommandons de l'installer car il permet d'am?liorer la
connectivit? des noeuds utilisant des adresses ip dynamiques (la plupart des
noeuds)."/>
+ <str id="upnp.description" txt="Un pack permettant d'activer le support
UP&P pour freenet. Universal Plug aNd Play est le protocole permettant ?
freenet de d?couvrir dynamiquement quel est votre adresse IP et d'?tablir un
port-forwarding. Ce protocole ne doit pas ?tre utilis? si vous de faites pas
confiance au r?seau auquel vous ?tes connect?. Nous recommandons tout de m?me
de l'installer car il permet d'am?liorer la connectivit? des noeuds."/>
<str id="mdns.description" txt="Un pack permettant d'installer le plugin
MDNSDiscovery pour freenet. MDNS est le protocole connu sous les noms
ZeroConf/Bonjour/Rendez-Vous permettant ? freenet de d?couvrir dynamiquement
les autres noeuds pr?sents sur le r?seau local. Ce protocole permet aussi aux
clients compatibles de s'auto-configurer."/>
<str id="librarian.description" txt="Un pack installant le plugin
Librarian : Un mini moteur de recherche pour freenet."/>
<str id="jsite.description" txt="Un pack installant jSite, un outil pour
ins?rer et maintenir un 'freesite' sur freenet."/>
Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2007-05-24 21:55:25 UTC (rev 13362)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2007-05-24 22:29:06 UTC (rev 13363)
@@ -27,6 +27,16 @@
@del /F mdns > NUL
:nomdns
+ at if not exist upnp goto noupnp
+ at echo -UPnP
+ at set PLUGINS=plugins.UPnP.UPnP at
file:///%INSTALL_PATH%\plugins\UPnP.jar;%PLUGINS%
+ at if exist offline goto end2
+ at java -jar bin\sha1test.jar plugins/UPnP.jar.url plugins > NUL
+:end2
+ at copy plugins\UPnP.jar.url plugins\UPnP.jar > NUL
+ at del /F upnp > NUL
+:noupnp
+
@if not exist librarian goto nolibrarian
@echo -Librarian
@set PLUGINS=plugins.Librarian.Librarian at
file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
