OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Aug-2008 11:51:56
Branch: HEAD Handle: 2008080210515500
Modified files:
openpkg-src/yuicompressor
yuicompressor.patch yuicompressor.spec
Log:
simplify compilation and avoid 'var' messages at all
Summary:
Revision Changes Path
1.2 +9 -7 openpkg-src/yuicompressor/yuicompressor.patch
1.7 +10 -14 openpkg-src/yuicompressor/yuicompressor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/yuicompressor/yuicompressor.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 yuicompressor.patch
--- openpkg-src/yuicompressor/yuicompressor.patch 2 Aug 2008 08:52:04
-0000 1.1
+++ openpkg-src/yuicompressor/yuicompressor.patch 2 Aug 2008 09:51:55
-0000 1.2
@@ -1,18 +1,20 @@
Index: src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
--- src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java.orig
2008-07-10 14:38:00 +0200
-+++ src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
2008-08-02 10:04:52 +0200
-@@ -902,7 +902,7 @@
++++ src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
2008-08-02 11:48:31 +0200
+@@ -901,10 +901,6 @@
+
case Token.VAR:
- if (mode == BUILDING_SYMBOL_TREE &&
scope.incrementVarCount() > 1) {
+- if (mode == BUILDING_SYMBOL_TREE &&
scope.incrementVarCount() > 1) {
- warn("Try to use a single 'var' statement per
scope.", true);
-+ System.err.println("[INFO] Try to use a single
'var' statement per scope.");
- }
-
+- }
+-
/* FALLSTHROUGH */
+
+ case Token.CONST:
Index: src/com/yahoo/platform/yui/compressor/YUICompressor.java
--- src/com/yahoo/platform/yui/compressor/YUICompressor.java.orig
2008-07-10 14:38:00 +0200
-+++ src/com/yahoo/platform/yui/compressor/YUICompressor.java 2008-08-02
10:04:22 +0200
++++ src/com/yahoo/platform/yui/compressor/YUICompressor.java 2008-08-02
11:48:07 +0200
@@ -49,7 +49,7 @@
if (verbose) {
String jvmVendor = System.getProperty("java.vendor");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/yuicompressor/yuicompressor.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 yuicompressor.spec
--- openpkg-src/yuicompressor/yuicompressor.spec 2 Aug 2008 08:52:04
-0000 1.6
+++ openpkg-src/yuicompressor/yuicompressor.spec 2 Aug 2008 09:51:55
-0000 1.7
@@ -67,21 +67,17 @@
%build
( cd src
jar -x <../build/yuicompressor-%{version}.jar
- for java in \
- org/mozilla/javascript/Token.java \
- org/mozilla/javascript/TokenStream.java \
- org/mozilla/javascript/Parser.java \
- org/mozilla/javascript/Decompiler.java \
- com/yahoo/platform/yui/compressor/JavaScriptToken.java \
- com/yahoo/platform/yui/compressor/ScriptOrFnScope.java \
- com/yahoo/platform/yui/compressor/JavaScriptCompressor.java \
- com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java \
- com/yahoo/platform/yui/compressor/CssCompressor.java \
- com/yahoo/platform/yui/compressor/YUICompressor.java \
- ; do
- javac -Vsun-jdk -cp . $java || exit $?
- done
find . -name "*.orig" -print | xargs rm -f
+ javac -Vsun-jdk -cp . org/mozilla/javascript/Token.java
+ javac -Vsun-jdk -cp . org/mozilla/javascript/TokenStream.java
+ javac -Vsun-jdk -cp . org/mozilla/javascript/Parser.java
+ javac -Vsun-jdk -cp . org/mozilla/javascript/Decompiler.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/JavaScriptToken.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/ScriptOrFnScope.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/CssCompressor.java
+ javac -Vsun-jdk -cp .
com/yahoo/platform/yui/compressor/YUICompressor.java
) || exit $?
mv src/META-INF .
jar -cfm build/yuicompressor-%{version}.jar META-INF/MANIFEST.MF -C src/
.
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
