You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/09/14 12:31:32 UTC
svn commit: r996819 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/ drlvm/ jdktools/
jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
Author: hindessm
Date: Tue Sep 14 10:31:32 2010
New Revision: 996819
URL: http://svn.apache.org/viewvc?rev=996819&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@996806:
r996806 | sjanuary | 2010-09-14 10:17:35 +0100 (Tue, 14 Sep 2010) | 1 line
Minor changes required by some reorganisation in pack200 module
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:31:32 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801
+/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801,996806
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:31:32 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798,996801
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798,996801,996806
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:31:32 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801,996806
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:31:32 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801,996806
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:31:32 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801,996806
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147
Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java?rev=996819&r1=996818&r2=996819&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java Tue Sep 14 10:31:32 2010
@@ -41,6 +41,7 @@ public class Main {
String outputFileName = null;
PackingOptions options = new PackingOptions();
String value = null;
+ boolean repack = false;
for (int i = 0; i < args.length; i++) {
if ("--help".equals(args[i]) || "-help".equals(args[i])
@@ -219,10 +220,8 @@ public class Main {
nameEqualsAction[1]);
} else if ("-v".equals(args[i]) || "--verbose".equals(args[i])) {
options.setVerbose(true);
- options.setQuiet(false);
} else if ("-q".equals(args[i]) || "--quiet".equals(args[i])) {
options.setQuiet(true);
- options.setVerbose(false);
} else if (args[i].startsWith("-l")) {
value = args[i].substring(2);
if (value.length() == 0) {
@@ -238,7 +237,7 @@ public class Main {
} else if (args[i].startsWith("--log-file=")) {
options.setLogFile(args[i].substring(11));
} else if ("-r".equals(args[i]) || "--repack".equals(args[i])) {
- options.setRepack(true);
+ repack = true;
} else if (args[i].startsWith("-f")) {
value = args[i].substring(2);
if (value.length() == 0) {
@@ -266,7 +265,7 @@ public class Main {
}
}
- if (options.isRepack()) {
+ if (repack) {
repack(inputFileName, outputFileName, options);
} else {
pack(inputFileName, outputFileName, options);
@@ -362,7 +361,6 @@ public class Main {
org.apache.harmony.unpack200.Archive unpacker = new org.apache.harmony.unpack200.Archive(
inputStream, jarOutputStream);
unpacker.setVerbose(options.isVerbose());
- unpacker.setQuiet(options.isQuiet());
// set deflate_hint option
if (!options.isKeepDeflateHint()) {
unpacker.setDeflateHint("true".equals(options.getDeflateHint()));