makedist.py now uses git.

9 files changed, 112 insertions, 76 deletions

diff --git a/cpp/makedist.py b/cpp/makedist.py
index 62c159efffd..bc6151cb055 100755
--- a/cpp/makedist.py
+++ b/cpp/makedist.py
@@ -195,7 +195,7 @@ def fixVersion(files, version, mmversion):
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 for x in sys.argv[1:]:
     if x == "-h":
@@ -209,7 +209,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -218,17 +218,19 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
-# Export sources from CVS.
+# Export sources from git.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag + " ice")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/ice && tar xf -)")
+
+os.chdir(distdir)
 
 #
 # Get Ice version.
diff --git a/cppe/makedist.py b/cppe/makedist.py
index 10a90fd2628..64e6e888a32 100755
--- a/cppe/makedist.py
+++ b/cppe/makedist.py
@@ -192,7 +192,7 @@ def fixVersion(files, version):
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 skipDocs = 0
 verbose = 0
 for x in sys.argv[1:]:
@@ -209,7 +209,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -218,17 +218,19 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icee"))
 
 #
-# Export sources from CVS.
+# Export sources from git.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out sources " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag + " icee")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/icee && tar xf -)")
+
+os.chdir(distdir)
 
 #
 # Remove files.
diff --git a/cs/makedist.py b/cs/makedist.py
index 79a9751e715..0a9cc50e5b6 100755
--- a/cs/makedist.py
+++ b/cs/makedist.py
@@ -72,7 +72,7 @@ win32 = sys.platform.startswith("win") or sys.platform.startswith("cygwin")
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 for x in sys.argv[1:]:
     if x == "-h":
@@ -86,7 +86,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -95,20 +95,25 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icecs"))
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
-# Export C# and C++ sources from CVS.
+# Export C# and C++ sources from git.
 #
 # NOTE: Assumes that the C++ and C# trees will use the same tag.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag +
-          " icecs ice/bin ice/config ice/include ice/lib ice/slice ice/src")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/icecs && tar xf -)")
+os.chdir(os.path.join("..", "cpp"))
+os.system("git archive " + quiet + " " + tag + " . | (cd ../cs/dist/ice && tar xf -)")
+os.chdir(os.path.join("..", "cs"))
+
+os.chdir(distdir)
 
 #
 # Copy Slice directories.
diff --git a/java/makedist.py b/java/makedist.py
index e3c90bd8236..7587750bed4 100755
--- a/java/makedist.py
+++ b/java/makedist.py
@@ -87,7 +87,7 @@ if sys.platform.startswith("win") or sys.platform.startswith("cygwin"):
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 skipTranslators = False 
 verbose = False 
 keepGoing = False
@@ -108,7 +108,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -118,20 +118,25 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icej"))
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
-# Export Java and C++ sources from CVS.
+# Export Java and C++ sources from git.
 #
 # NOTE: Assumes that the C++ and Java trees will use the same tag.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag +
-          " icej ice/bin ice/config ice/include ice/lib ice/slice ice/src")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/icej && tar xf -)")
+os.chdir(os.path.join("..", "cpp"))
+os.system("git archive " + quiet + " " + tag + " . | (cd ../java/dist/ice && tar xf -)")
+os.chdir(os.path.join("..", "java"))
+
+os.chdir(distdir)
 
 #
 # Check known preconditions for proper distribution building. Failed
diff --git a/javae/makedist.py b/javae/makedist.py
index 37d72467ba1..ab353cd84eb 100755
--- a/javae/makedist.py
+++ b/javae/makedist.py
@@ -66,7 +66,7 @@ else:
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 antArgs = ""
 for x in sys.argv[1:]:
@@ -83,7 +83,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 
 #
@@ -93,17 +93,19 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "iceje"))
 
 #
-# Export IceEJ sources from CVS.
+# Export IceEJ sources from git.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out sources " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag + " iceje")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/iceje && tar xf -)")
+
+os.chdir(distdir)
 
 #
 # Remove files.
diff --git a/php/makedist.py b/php/makedist.py
index da1ae290dc6..0a5f630d8df 100755
--- a/php/makedist.py
+++ b/php/makedist.py
@@ -18,6 +18,7 @@ def usage():
     print
     print "Options:"
     print "-h    Show this message."
+    print "-v    Be verbose."
     print
     print "If no tag is specified, HEAD is used."
 
@@ -53,7 +54,7 @@ def fixVersion(files, version):
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 for x in sys.argv[1:]:
     if x == "-h":
         usage()
@@ -64,7 +65,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -73,12 +74,18 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icephp"))
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
-# Export sources from CVS.
+# Export sources from git.
 #
-os.system("cvs -d cvs.zeroc.com:/home/cvsroot export " + tag + " icephp ice/config ice/include/IceUtil/Config.h")
+os.system("git archive " + tag + " . | (cd dist/icephp && tar xf -)")
+os.chdir(os.path.join("..", "cpp"))
+os.system("git archive " + tag + " . | (cd ../php/dist/ice && tar xf -)")
+os.chdir(os.path.join("..", "php"))
+
+os.chdir(distdir)
 
 
 #
diff --git a/py/makedist.py b/py/makedist.py
index 24f275c6bd5..b220c0a33eb 100755
--- a/py/makedist.py
+++ b/py/makedist.py
@@ -59,7 +59,7 @@ win32 = sys.platform.startswith("win") or sys.platform.startswith("cygwin")
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 for x in sys.argv[1:]:
     if x == "-h":
@@ -73,7 +73,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -82,20 +82,25 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icepy"))
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
-# Export Python and C++ sources from CVS.
+# Export Python and C++ sources from git.
 #
 # NOTE: Assumes that the C++ and Python trees will use the same tag.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out sources " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag +
-          " icepy ice/config")
+    quiet = ""
+os.system("git archive " + tag + " . | (cd dist/icepy && tar xf -)")
+os.chdir(os.path.join("..", "cpp"))
+os.system("git archive " + tag + " . | (cd ../py/dist/ice && tar xf -)")
+os.chdir(os.path.join("..", "py"))
+
+os.chdir(distdir)
 
 print "Copying Make.rules.* files from ice..."
 for x in glob.glob(os.path.join("ice", "config", "Make.rules.*")):
diff --git a/rb/makedist.py b/rb/makedist.py
index 50367b4dfbb..cab57606276 100755
--- a/rb/makedist.py
+++ b/rb/makedist.py
@@ -59,7 +59,7 @@ win32 = sys.platform.startswith("win") or sys.platform.startswith("cygwin")
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 for x in sys.argv[1:]:
     if x == "-h":
@@ -73,7 +73,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 #
 # Remove any existing "dist" directory and create a new one.
@@ -82,22 +82,25 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icerb"))
+os.mkdir(os.path.join(distdir, "ice"))
 
 #
 # Export Ruby and C++ sources from CVS.
 #
 # NOTE: Assumes that the C++ and Ruby trees will use the same tag.
 #
-print "Checking out Ruby sources using CVS tag " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag + " icerb")
-print "Checking out C++ sources using CVS tag " + tag + "..."
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag +
-          " ice/config ")
+    quiet = ""
+print "Checking out sources " + tag + "..."
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/icerb && tar xf -)")
+os.chdir(os.path.join("..", "cpp"))
+os.system("git archive " + quiet + " " + tag + " . | (cd ../rb/dist/ice && tar xf -)")
+os.chdir(os.path.join("..", "rb"))
+
+os.chdir(distdir)
 
 #
 # Copy Make.rules.Linux and Make.rules.msvc
diff --git a/vb/makedist.py b/vb/makedist.py
index 3e4c777cc79..e46367d1bb0 100755
--- a/vb/makedist.py
+++ b/vb/makedist.py
@@ -83,7 +83,7 @@ win32 = sys.platform.startswith("win") or sys.platform.startswith("cygwin")
 #
 # Check arguments
 #
-tag = "-rHEAD"
+tag = "HEAD"
 verbose = 0
 for x in sys.argv[1:]:
     if x == "-h":
@@ -97,7 +97,7 @@ for x in sys.argv[1:]:
         usage()
         sys.exit(1)
     else:
-        tag = "-r" + x
+        tag = x
 
 if win32 and not skipDocs:
     print sys.argv[0] + ": the documentation cannot be built on Windows."
@@ -110,20 +110,25 @@ distdir = "dist"
 if os.path.exists(distdir):
     shutil.rmtree(distdir)
 os.mkdir(distdir)
-os.chdir(distdir)
+os.mkdir(os.path.join(distdir, "icevb"))
+os.mkdir(os.path.join(distdir, "icecs"))
 
 #
-# Export VB and C++ sources from CVS.
+# Export VB and C++ sources from git.
 #
-# NOTE: Assumes that the C++ and C# trees will use the same tag.
+# NOTE: Assumes that the C++ and VB trees will use the same tag.
 #
-print "Checking out CVS tag " + tag + "..."
+print "Checking out " + tag + "..."
 if verbose:
-    quiet = ""
+    quiet = "-v"
 else:
-    quiet = "-Q"
-os.system("cvs " + quiet + " -d cvs.zeroc.com:/home/cvsroot export " + tag +
-          " icevb icecs/src/Ice/AssemblyInfo.cs")
+    quiet = ""
+os.system("git archive " + quiet + " " + tag + " . | (cd dist/icevb && tar xf -)")
+os.chdir(os.path.join("..", "cs"))
+os.system("git archive " + quiet + " " + tag + " . | (cd ../vb/dist/icecs && tar xf -)")
+os.chdir(os.path.join("..", "vb"))
+
+os.chdir(distdir)
 
 #
 # Remove files.