This commit is contained in:
edburns%acm.org 2002-08-31 02:46:40 +00:00
parent b20d8e8183
commit 8cc1c14cdf
2 changed files with 16 additions and 18 deletions

View File

@ -29,7 +29,7 @@ PACKAGE_LIB=$(PACKAGE_DIR)/lib
PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example
ifeq ($(PACKAGE_VER),)
PACKAGE_VER=1.2
PACKAGE_VER=1_2
endif
@ -135,9 +135,11 @@ ifneq ($(BUILD_WEBCLIENT_ONLY),)
cp $(DIST)/../java/build/install_webclient_unix.js $(DIST)/install.js
cp $(DIST)/../java/build/symlink.sh $(DIST)/symlink.sh
chmod 775 $(DIST)/symlink.sh
cp $(DIST)/../java/build/chmodx.sh $(DIST)/chmodx.sh
chmod 775 $(DIST)/chmodx.sh
cp $(DIST)/../java/build/README.WEBCLIENT $(PACKAGE_DIR)/README.WEBCLIENT
cd $(DIST) ; \
$(JDKHOME)/bin/jar -cvfM0 webclient_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh javadev
$(JDKHOME)/bin/jar -cvfM0 webclient_$(PACKAGE_VER)_$(PACKAGE_OS).xpi install.js symlink.sh chmodx.sh javadev
else
ifneq ($(BUILD_BLACKCONNECT_ONLY),)
if test ! -d $(PACKAGE_DIR) ; then mkdir $(PACKAGE_DIR) ; else true ; fi ;

View File

@ -28,6 +28,15 @@ function symlink(lnk, tgt)
var err = execute("symlink.sh", tgt + " " + lnk);
logComment("execute symlink.sh "+tgt+" "+lnk+" returned: "+err);
}
// this function makes the argument executable
function chmodx(tgt)
{
var err = execute("chmodx.sh", tgt);
logComment("execute chmodx.sh "+tgt+" returned: "+err);
}
// main
var srDest;
@ -36,7 +45,7 @@ function symlink(lnk, tgt)
srDest = 1000;
logComment("Starting Install Process");
err = initInstall("Webclient", "Webclient", "1.0");
err = initInstall("Webclient", "Webclient", "1.2");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -46,7 +55,7 @@ logComment("Starting Install Process");
{
setPackageFolder(fProgram);
err = addDirectory("",
"1.0",
"1.2",
"javadev", // dir name in jar to extract
fProgram, // Where to put this file
// (Returned from GetFolder)
@ -58,20 +67,7 @@ logComment("Starting Install Process");
var fJavadev = getFolder("Program","javadev");
symlink(fComponents + "libjavadom.so",
getFolder(fJavadev, "lib/libjavadom.so"));
symlink(fComponents + "libbcorb.so",
getFolder(fJavadev, "lib/libbcorb.so"));
symlink(fComponents + "libbcjavastubs.so",
getFolder(fJavadev, "lib/libbcjavastubs.so"));
symlink(fComponents + "libjavaloader.so",
getFolder(fJavadev, "lib/libjavaloader.so"));
symlink(fComponents + "libjavaSample.so",
getFolder(fJavadev, "lib/libjavaSample.so"));
symlink(fComponents + "libbcTest.so",
getFolder(fJavadev, "lib/libbcTest.so"));
symlink(fComponents + "libbcxpcomstubs.so",
getFolder(fJavadev, "lib/libbcxpcomstubs.so"));
symlink(fProgram + "regxpcom",
getFolder(fJavadev, "lib/regxpcom"));
chmodx(getFolder(fJavadev, "example/runem.bat"));
// check return value
if(err == SUCCESS)