cleanup; adding binaries

1 files changed, 144 insertions, 20 deletions

diff --git a/java/makedist.py b/java/makedist.py
index e35cbe7300f..7a9af79c77a 100755
--- a/java/makedist.py
+++ b/java/makedist.py
@@ -13,60 +13,94 @@
 #
 # **********************************************************************
 
-import os, sys, fnmatch, re
+import os, sys, shutil, re
 
 #
-# Remove a file or directory (recursive).
-#
-def rm(path):
-    if os.path.isdir(path) and not os.path.islink(path):
-        for x in os.listdir(path):
-            rm(os.path.join(path, x))
-        os.rmdir(path)
-    else:
-        os.remove(path)
+# Show usage information.
+#
+def usage():
+    print "usage: " + sys.argv[0] + " [-h] [-b] [tag]"
+    print
+    print "Options:"
+    print "    -h  Show this message."
+    print "    -b  Create a platform-specific binary archives. If not specified,"
+    print "        only source archives will be created."
+    print
+    print "If no tag is specified, HEAD is used."
 
 #
 # Check arguments
 #
 tag = "-rHEAD"
+binary = 0
 for x in sys.argv[1:]:
     if x == "-h":
-        print "usage: " + sys.argv[0] + " [-h] [tag]"
+        usage()
         sys.exit(0)
+    elif x == "-b":
+        if not os.environ.has_key("ICE_HOME"):
+            print "The ICE_HOME environment variable is not set."
+            sys.exit(1)
+        binary = 1
+    elif x.startswith("-"):
+        print sys.argv[0] + ": unknown option `" + x + "'"
+        print
+        usage()
+        sys.exit(1)
     else:
         tag = "-r" + x
 
 #
 # Remove any existing "dist" directory and create a new one.
 #
-if os.path.exists("dist"):
-    rm("dist")
-os.mkdir("dist")
-os.chdir("dist")
+distdir = "dist"
+if os.path.exists(distdir):
+    shutil.rmtree(distdir)
+os.mkdir(distdir)
+os.chdir(distdir)
 
 #
-# Export sources from CVS.
+# Export Java sources from CVS.
 #
 os.system("cvs -z5 -d cvs.mutablerealms.com:/home/cvsroot export " + tag + " icej")
 
 #
+# Export C++ sources in order to copy Slice files into the icej tree.
+#
+# NOTE: Assumes that the C++ and Java trees will use the same tag.
+#
+os.system("cvs -z5 -d cvs.mutablerealms.com:/home/cvsroot export " + tag + " ice")
+slicedirs = [\
+    "Freeze",\
+    "Glacier",\
+    "Ice",\
+    "IceBox",\
+    "IcePack",\
+    "IceStorm",\
+    "Yellow",\
+]
+os.mkdir(os.path.join("icej", "slice"))
+for x in slicedirs:
+    shutil.copytree(os.path.join("ice", "slice", x), os.path.join("icej", "slice", x), 1)
+shutil.rmtree("ice")
+
+#
 # Remove files.
 #
 filesToRemove = [ \
     "icej/makedist.py", \
     ]
 for x in filesToRemove:
-    rm(x)
+    os.remove(x)
 
 #
 # Get Ice version.
 #
-config = open("icej/src/IceUtil/Version.java", "r")
+config = open(os.path.join("icej", "src", "IceUtil", "Version.java"), "r")
 version = re.search("ICE_STRING_VERSION = \"(.*)\"", config.read()).group(1)
 
 #
-# Create archives.
+# Create source archives.
 #
 icever = "IceJ-" + version
 os.mkdir(icever)
@@ -79,6 +113,96 @@ os.system("zip -9 -r " + icever + ".zip " + icever)
 #
 
 #
+# Create binary archives if requested.
+#
+if binary:
+    cwd = os.getcwd()
+    os.chdir(os.path.join(icever, "icej"))
+
+    #
+    # Build classes.
+    #
+    os.system("ant")
+
+    os.chdir(cwd)
+
+    #
+    # Get platform.
+    #
+    platform = ""
+    if sys.platform.startswith("win") or sys.platform.startswith("cygwin"):
+        platform = "win32"
+    elif sys.platform.startswith("linux"):
+        platform = "linux"
+    else:
+        print "unknown platform!"
+        sys.exit(1)
+
+    #
+    # Copy executables and libraries.
+    #
+    executables = [ ]
+    libraries = [ ]
+    symlinks = 0
+    if platform == "win32":
+        winver = version.replace(".", "")
+        executables = [ \
+            "glacierrouter.exe",\
+            "glacierstarter.exe",\
+            "icecpp.exe",\
+            "slice2freezej.exe",\
+            "slice2java.exe",\
+            "slice2xsd.exe",\
+        ]
+        libraries = [ \
+            "glacier" + winver + ".dll",\
+            "icessl" + winver + ".dll",\
+            "ice" + winver + ".dll",\
+            "iceutil" + winver + ".dll",\
+            "slice" + winver + ".dll",\
+        ]
+    else:
+        executables = [ \
+            "glacierrouter",\
+            "glacierstarter",\
+            "icecpp",\
+            "slice2freezej",\
+            "slice2java",\
+            "slice2xsd",\
+        ]
+        libraries = [ \
+            "libGlacier.so",\
+            "libIceSSL.so",\
+            "libIce.so",\
+            "libIceUtil.so",\
+            "libSlice.so",\
+        ]
+        symlinks = 1
+
+    bindir = os.path.join(icever, "icej", "bin")
+    libdir = os.path.join(icever, "icej", "lib")
+    os.mkdir(bindir)
+    icehome = os.environ["ICE_HOME"]
+    for x in executables:
+        shutil.copyfile(os.path.join(icehome, "bin", x), os.path.join(bindir, x))
+    if symlinks:
+        for x in libraries:
+            libname = x + '.' + version
+            shutil.copyfile(os.path.join(icehome, "lib", libname), os.path.join(libdir, libname))
+            os.chdir(libdir)
+            os.symlink(libname, x)
+            os.chdir(cwd)
+    else:
+        for x in libraries:
+            shutil.copyfile(os.path.join(icehome, "lib", x), os.path.join(libdir, x))
+
+    #
+    # Create binary archives.
+    #
+    os.system("tar cvzf " + icever + "-bin-" + platform + ".tar.gz " + icever)
+    os.system("zip -9ry " + icever + "-bin-" + platform + ".zip " + icever)
+
+#
 # Done.
 #
-rm(icever)
+shutil.rmtree(icever)