Update of /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler
In directory sheep:/tmp/cvs-serv10032/src/lib/com/izforge/izpack/compiler
Modified Files:
ByteCountingOutputStream.java Compiler.java
CompilerConfig.java CompilerException.java PackInfo.java
Packager.java PackagerListener.java Property.java
Log Message:
Synchronizing HEAD from the changes in branch-3-8.
Index: ByteCountingOutputStream.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/ByteCountingOutputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ByteCountingOutputStream.java 6 May 2005 20:09:07 -0000 1.4
+++ ByteCountingOutputStream.java 12 Mar 2006 16:32:15 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
Index: Compiler.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/Compiler.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- Compiler.java 27 Oct 2005 16:44:49 -0000 1.111
+++ Compiler.java 12 Mar 2006 16:32:15 -0000 1.112
@@ -1,6 +1,6 @@
/*
* $Id$
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
@@ -62,7 +62,7 @@
public class Compiler extends Thread
{
/** The IzPack version. */
- public final static String IZPACK_VERSION = "3.8.0";
+ public final static String IZPACK_VERSION = "3.8.1";
/** The IzPack home directory. */
public static String IZPACK_HOME = ".";
Index: CompilerConfig.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/CompilerConfig.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CompilerConfig.java 9 Sep 2005 03:28:22 -0000 1.8
+++ CompilerConfig.java 12 Mar 2006 16:32:15 -0000 1.9
@@ -1,6 +1,6 @@
/*
* $Id$
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
@@ -1693,7 +1693,7 @@
System.out.println("");
System.out.println("< compiler specifications version : " + VERSION +
" >");
System.out.println("");
- System.out.println("- Copyright (C) 2001-2005 Julien Ponge");
+ System.out.println("- Copyright (C) 2001-2006 Julien Ponge");
System.out.println("- Visit http://www.izforge.com/ for the latests
releases");
System.out.println("- Released under the terms of the Apache Software
License version 2.0.");
System.out.println("");
@@ -1714,23 +1714,14 @@
// First check
int nArgs = args.length;
- if (nArgs < 3) throw new Exception("no arguments given");
+ if (nArgs < 1) throw new Exception("no arguments given");
- // We get the IzPack home directory
- int stdArgsIndex;
+ // We get the IzPack home directory
String home = ".";
- if (args[0].equalsIgnoreCase("-HOME"))
- {
- stdArgsIndex = 2;
- home = args[1];
- }
- else
- {
- stdArgsIndex = 0;
- String izHome = System.getProperty("IZPACK_HOME");
- if (izHome != null) home = izHome;
- }
-
+ String izHome = System.getProperty("IZPACK_HOME");
+ if (izHome != null) home =
izHome;
+
+
File homeFile = new File(home);
if (!homeFile.exists() && homeFile.isDirectory())
{
@@ -1740,7 +1731,7 @@
Compiler.setIzpackHome(home);
// The users wants to know the command line parameters
- if (args[stdArgsIndex].equalsIgnoreCase("-?"))
+ if (args[0].equalsIgnoreCase("-?"))
{
System.out.println("-> Command line parameters are : (xml
file) [args]");
System.out.println(" (xml file): the xml file describing the
installation");
@@ -1756,9 +1747,9 @@
System.out.println(" -l (compression-level) : indicates the
level for the used compression format");
System.out.println(" if supported. Only integer
are valid\n");
- System.out
- .println(" When using vm option -DSTACKTRACE=true
there is all kind of debug info ");
+ System.out.println(" When using vm option -DSTACKTRACE=true
there is all kind of debug info ");
System.out.println("");
+ exitCode = 0;
}
else
{
@@ -1767,12 +1758,12 @@
// We get the input file name and we initialize the output file
// name
- filename = args[stdArgsIndex];
+ filename = args[0];
// default jar files names are based on input file name
output = filename.substring(0, filename.length() - 3) + "jar";
// We parse the other ones
- int pos = stdArgsIndex + 1;
+ int pos = 1;
while (pos < nArgs)
if ((args[pos].startsWith("-")) && (args[pos].length() ==
2))
{
Index: CompilerException.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/CompilerException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CompilerException.java 6 May 2005 20:09:07 -0000 1.7
+++ CompilerException.java 12 Mar 2006 16:32:15 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
Index: PackInfo.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/PackInfo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PackInfo.java 24 May 2005 03:48:35 -0000 1.9
+++ PackInfo.java 12 Mar 2006 16:32:15 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
Index: Packager.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/Packager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Packager.java 26 Aug 2005 06:48:50 -0000 1.40
+++ Packager.java 12 Mar 2006 16:32:15 -0000 1.41
@@ -1,6 +1,6 @@
/*
* $Id$
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
Index: PackagerListener.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/PackagerListener.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- PackagerListener.java 6 May 2005 20:09:07 -0000 1.15
+++ PackagerListener.java 12 Mar 2006 16:32:15 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
Index: Property.java
===================================================================
RCS file:
/cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/compiler/Property.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Property.java 24 May 2005 05:09:08 -0000 1.8
+++ Property.java 12 Mar 2006 16:32:15 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
*
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
|
