Commit emails of the iDok project

["AFS account Roman Geus" <geus AT savannah.psi.ch>]

Author: geus
Date: Fri Feb 29 15:09:12 2008
New Revision: 17

Log:
Merged trunk revisions r14:16 into branches/1.0.x

Modified:
   branches/1.0.x/java/ch/idok/tools/GetRevisionInfo.java
   branches/1.0.x/sites/psi/build.xml

Modified: branches/1.0.x/java/ch/idok/tools/GetRevisionInfo.java
==============================================================================
--- branches/1.0.x/java/ch/idok/tools/GetRevisionInfo.java      (original)
+++ branches/1.0.x/java/ch/idok/tools/GetRevisionInfo.java      Fri Feb 29 
15:09:12 2008
@@ -41,20 +41,28 @@
      *                Command line arguments
      * @throws Exception
      */
-    public static void main(final String[] args) throws Exception {
+    public static void main(final String[] args) {
         SVNWCClient svnClient = new SVNWCClient(null, null);
-        svnClient.doInfo(new File(""), SVNRevision.WORKING, false,
-                new ISVNInfoHandler() {
-                    public void handleInfo(SVNInfo info) throws SVNException 
{
-                        if (args[0].equals("revision"))
-                            System.out.println(info.getCommittedRevision()
-                                    .getNumber());
-                        else
-                            System.out.println(info.getCommittedDate());
+        try {
+            svnClient.doInfo(new File(""), SVNRevision.WORKING, false,
+                    new ISVNInfoHandler() {
+                        public void handleInfo(SVNInfo info) throws 
SVNException {
+                            if (args[0].equals("revision"))
+                                
System.out.println(info.getCommittedRevision()
+                                        .getNumber());
+                            else
+                                System.out.println(info.getCommittedDate());
+                        }
                     }
-                }
 
-        );
+            );
+        } catch (SVNException e) {
+            // This does not seem to be a working copy
+            if (args[0].equals("revision"))
+                System.out.println("unknown");
+            else
+                System.out.println("unknown");
+        }
 
     }
 

Modified: branches/1.0.x/sites/psi/build.xml
==============================================================================
--- branches/1.0.x/sites/psi/build.xml  (original)
+++ branches/1.0.x/sites/psi/build.xml  Fri Feb 29 15:09:12 2008
@@ -275,10 +275,11 @@
                        <arg 
value="https://svn.psi.ch/dms/dms/${sdist.repo.dir}"; />
                        <arg value="${sdist.dir}" />
                </exec>
-               <tar basedir="${sdist.export.dir}"
-                    destfile="${sdist.release.name}.tar.gz"
-                    compression="gzip"
-                    longfile="gnu" />
+               <exec dir="${sdist.export.dir}" executable="tar">
+                       <arg value="zcvf" />
+         <arg value="${idok.basedir}/${sdist.release.name}.tar.gz" />
+                       <arg value="${sdist.release.name}" />
+               </exec>
                <zip basedir="${sdist.export.dir}"
                     destfile="${sdist.release.name}.zip" />
                <delete dir="${sdist.dir}" />