Changeset 102356 for trunk/dports/java


Ignore:
Timestamp:
Jan 31, 2013, 11:28:24 PM (6 years ago)
Author:
cal@…
Message:

dex2jar: fix classpath

Location:
trunk/dports/java/dex2jar
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/dex2jar/Portfile

    r102355 r102356  
    66name                dex2jar
    77version             0.0.9.12-a
     8revision            1
    89maintainers         cal openmaintainer
    910
     
    3536worksrcdir          dex2jar-0.0.9.12
    3637patchfiles          patch-adjust-classpath.diff
     38post-patch {
     39    eval reinplace -W ${worksrcpath} "s#@@PREFIX@@#${prefix}#g" [glob -directory ${worksrcpath} *.sh]
     40}
     41
    3742use_configure       no
    3843build               {}
    39 destroot            {
     44destroot {
    4045    xinstall -m 0755 -W ${worksrcpath} \
    4146        d2j-apk-sign.sh d2j-asm-verify.sh d2j-decrpyt-string.sh d2j-dex-asmifier.sh \
  • trunk/dports/java/dex2jar/files/patch-adjust-classpath.diff

    r102355 r102356  
    1 --- d2j-apk-sign.sh.orig        2013-01-31 23:50:23.000000000 +0100
    2 +++ d2j-apk-sign.sh     2013-01-31 23:51:32.000000000 +0100
    3 @@ -17,24 +17,4 @@
    4  # limitations under the License.
    5  #
    6  
    7 -# copy from $Tomcat/bin/startup.sh
    8 -# resolve links - $0 may be a softlink
    9 -PRG="$0"
    10 -while [ -h "$PRG" ] ; do
    11 -  ls=`ls -ld "$PRG"`
    12 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    13 -  if expr "$link" : '/.*' > /dev/null; then
    14 -    PRG="$link"
    15 -  else
    16 -    PRG=`dirname "$PRG"`/"$link"
    17 -  fi
    18 -done
    19 -PRGDIR=`dirname "$PRG"`
    20 -#
    21 -
    22 -_classpath="."
    23 -for k in "$PRGDIR"/lib/*.jar
    24 -do
    25 - _classpath="${_classpath}:${k}"
    26 -done
    27 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ApkSign" $@
    28 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.ApkSign" $@
    29 --- d2j-asm-verify.sh.orig      2013-01-31 23:50:23.000000000 +0100
    30 +++ d2j-asm-verify.sh   2013-01-31 23:53:14.000000000 +0100
    31 @@ -17,24 +17,4 @@
    32  # limitations under the License.
    33  #
    34  
    35 -# copy from $Tomcat/bin/startup.sh
    36 -# resolve links - $0 may be a softlink
    37 -PRG="$0"
    38 -while [ -h "$PRG" ] ; do
    39 -  ls=`ls -ld "$PRG"`
    40 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    41 -  if expr "$link" : '/.*' > /dev/null; then
    42 -    PRG="$link"
    43 -  else
    44 -    PRG=`dirname "$PRG"`/"$link"
    45 -  fi
    46 -done
    47 -PRGDIR=`dirname "$PRG"`
    48 -#
    49 -
    50 -_classpath="."
    51 -for k in "$PRGDIR"/lib/*.jar
    52 -do
    53 - _classpath="${_classpath}:${k}"
    54 -done
    55 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.AsmVerify" $@
    56 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.AsmVerify" $@
    57 --- d2j-decrpyt-string.sh.orig  2013-01-31 23:50:24.000000000 +0100
    58 +++ d2j-decrpyt-string.sh       2013-01-31 23:53:56.000000000 +0100
    59 @@ -17,24 +17,4 @@
    60  # limitations under the License.
    61  #
    62  
    63 -# copy from $Tomcat/bin/startup.sh
    64 -# resolve links - $0 may be a softlink
    65 -PRG="$0"
    66 -while [ -h "$PRG" ] ; do
    67 -  ls=`ls -ld "$PRG"`
    68 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    69 -  if expr "$link" : '/.*' > /dev/null; then
    70 -    PRG="$link"
    71 -  else
    72 -    PRG=`dirname "$PRG"`/"$link"
    73 -  fi
    74 -done
    75 -PRGDIR=`dirname "$PRG"`
    76 -#
    77 -
    78 -_classpath="."
    79 -for k in "$PRGDIR"/lib/*.jar
    80 -do
    81 - _classpath="${_classpath}:${k}"
    82 -done
    83 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DecryptStringCmd" $@
    84 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.DecryptStringCmd" $@
    85 --- d2j-dex-asmifier.sh.orig    2013-01-31 23:50:24.000000000 +0100
    86 +++ d2j-dex-asmifier.sh 2013-01-31 23:54:14.000000000 +0100
    87 @@ -17,24 +17,4 @@
    88  # limitations under the License.
    89  #
    90  
    91 -# copy from $Tomcat/bin/startup.sh
    92 -# resolve links - $0 may be a softlink
    93 -PRG="$0"
    94 -while [ -h "$PRG" ] ; do
    95 -  ls=`ls -ld "$PRG"`
    96 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    97 -  if expr "$link" : '/.*' > /dev/null; then
    98 -    PRG="$link"
    99 -  else
    100 -    PRG=`dirname "$PRG"`/"$link"
    101 -  fi
    102 -done
    103 -PRGDIR=`dirname "$PRG"`
    104 -#
    105 -
    106 -_classpath="."
    107 -for k in "$PRGDIR"/lib/*.jar
    108 -do
    109 - _classpath="${_classpath}:${k}"
    110 -done
    111 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.ASMifierFileV" $@
    112 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.ASMifierFileV" $@
    113 --- d2j-dex-dump.sh.orig        2013-01-31 23:50:24.000000000 +0100
    114 +++ d2j-dex-dump.sh     2013-01-31 23:54:37.000000000 +0100
    115 @@ -17,24 +17,4 @@
    116  # limitations under the License.
    117  #
    118  
    119 -# copy from $Tomcat/bin/startup.sh
    120 -# resolve links - $0 may be a softlink
    121 -PRG="$0"
    122 -while [ -h "$PRG" ] ; do
    123 -  ls=`ls -ld "$PRG"`
    124 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    125 -  if expr "$link" : '/.*' > /dev/null; then
    126 -    PRG="$link"
    127 -  else
    128 -    PRG=`dirname "$PRG"`/"$link"
    129 -  fi
    130 -done
    131 -PRGDIR=`dirname "$PRG"`
    132 -#
    133 -
    134 -_classpath="."
    135 -for k in "$PRGDIR"/lib/*.jar
    136 -do
    137 - _classpath="${_classpath}:${k}"
    138 -done
    139 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.Dump" $@
    140 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.Dump" $@
    141 --- d2j-dex2jar.sh.orig 2013-01-31 23:50:24.000000000 +0100
    142 +++ d2j-dex2jar.sh      2013-01-31 23:55:00.000000000 +0100
    143 @@ -17,24 +17,4 @@
    144  # limitations under the License.
    145  #
    146  
    147 -# copy from $Tomcat/bin/startup.sh
    148 -# resolve links - $0 may be a softlink
    149 -PRG="$0"
    150 -while [ -h "$PRG" ] ; do
    151 -  ls=`ls -ld "$PRG"`
    152 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    153 -  if expr "$link" : '/.*' > /dev/null; then
    154 -    PRG="$link"
    155 -  else
    156 -    PRG=`dirname "$PRG"`/"$link"
    157 -  fi
    158 -done
    159 -PRGDIR=`dirname "$PRG"`
    160 -#
    161 -
    162 -_classpath="."
    163 -for k in "$PRGDIR"/lib/*.jar
    164 -do
    165 - _classpath="${_classpath}:${k}"
    166 -done
    167 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Dex2jarCmd" $@
    168 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Dex2jarCmd" $@
    169 --- d2j-init-deobf.sh.orig      2013-01-31 23:50:24.000000000 +0100
    170 +++ d2j-init-deobf.sh   2013-01-31 23:55:07.000000000 +0100
    171 @@ -17,24 +17,4 @@
    172  # limitations under the License.
    173  #
    174  
    175 -# copy from $Tomcat/bin/startup.sh
    176 -# resolve links - $0 may be a softlink
    177 -PRG="$0"
    178 -while [ -h "$PRG" ] ; do
    179 -  ls=`ls -ld "$PRG"`
    180 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    181 -  if expr "$link" : '/.*' > /dev/null; then
    182 -    PRG="$link"
    183 -  else
    184 -    PRG=`dirname "$PRG"`/"$link"
    185 -  fi
    186 -done
    187 -PRGDIR=`dirname "$PRG"`
    188 -#
    189 -
    190 -_classpath="."
    191 -for k in "$PRGDIR"/lib/*.jar
    192 -do
    193 - _classpath="${_classpath}:${k}"
    194 -done
    195 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DeObfInitCmd" $@
    196 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.DeObfInitCmd" $@
    197 --- d2j-jar-access.sh.orig      2013-01-31 23:50:24.000000000 +0100
    198 +++ d2j-jar-access.sh   2013-01-31 23:55:11.000000000 +0100
    199 @@ -17,24 +17,4 @@
    200  # limitations under the License.
    201  #
    202  
    203 -# copy from $Tomcat/bin/startup.sh
    204 -# resolve links - $0 may be a softlink
    205 -PRG="$0"
    206 -while [ -h "$PRG" ] ; do
    207 -  ls=`ls -ld "$PRG"`
    208 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    209 -  if expr "$link" : '/.*' > /dev/null; then
    210 -    PRG="$link"
    211 -  else
    212 -    PRG=`dirname "$PRG"`/"$link"
    213 -  fi
    214 -done
    215 -PRGDIR=`dirname "$PRG"`
    216 -#
    217 -
    218 -_classpath="."
    219 -for k in "$PRGDIR"/lib/*.jar
    220 -do
    221 - _classpath="${_classpath}:${k}"
    222 -done
    223 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarAccessCmd" $@
    224 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.JarAccessCmd" $@
    225 --- d2j-jar-remap.sh.orig       2013-01-31 23:50:24.000000000 +0100
    226 +++ d2j-jar-remap.sh    2013-01-31 23:55:15.000000000 +0100
    227 @@ -17,24 +17,4 @@
    228  # limitations under the License.
    229  #
    230  
    231 -# copy from $Tomcat/bin/startup.sh
    232 -# resolve links - $0 may be a softlink
    233 -PRG="$0"
    234 -while [ -h "$PRG" ] ; do
    235 -  ls=`ls -ld "$PRG"`
    236 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    237 -  if expr "$link" : '/.*' > /dev/null; then
    238 -    PRG="$link"
    239 -  else
    240 -    PRG=`dirname "$PRG"`/"$link"
    241 -  fi
    242 -done
    243 -PRGDIR=`dirname "$PRG"`
    244 -#
    245 -
    246 -_classpath="."
    247 -for k in "$PRGDIR"/lib/*.jar
    248 -do
    249 - _classpath="${_classpath}:${k}"
    250 -done
    251 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarRemap" $@
    252 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.JarRemap" $@
    253 --- d2j-jar2dex.sh.orig 2013-01-31 23:50:24.000000000 +0100
    254 +++ d2j-jar2dex.sh      2013-01-31 23:55:19.000000000 +0100
    255 @@ -17,24 +17,4 @@
    256  # limitations under the License.
    257  #
    258  
    259 -# copy from $Tomcat/bin/startup.sh
    260 -# resolve links - $0 may be a softlink
    261 -PRG="$0"
    262 -while [ -h "$PRG" ] ; do
    263 -  ls=`ls -ld "$PRG"`
    264 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    265 -  if expr "$link" : '/.*' > /dev/null; then
    266 -    PRG="$link"
    267 -  else
    268 -    PRG=`dirname "$PRG"`/"$link"
    269 -  fi
    270 -done
    271 -PRGDIR=`dirname "$PRG"`
    272 -#
    273 -
    274 -_classpath="."
    275 -for k in "$PRGDIR"/lib/*.jar
    276 -do
    277 - _classpath="${_classpath}:${k}"
    278 -done
    279 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Dex" $@
    280 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jar2Dex" $@
    281 --- d2j-jar2jasmin.sh.orig      2013-01-31 23:50:24.000000000 +0100
    282 +++ d2j-jar2jasmin.sh   2013-01-31 23:55:23.000000000 +0100
    283 @@ -17,24 +17,4 @@
    284  # limitations under the License.
    285  #
    286  
    287 -# copy from $Tomcat/bin/startup.sh
    288 -# resolve links - $0 may be a softlink
    289 -PRG="$0"
    290 -while [ -h "$PRG" ] ; do
    291 -  ls=`ls -ld "$PRG"`
    292 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    293 -  if expr "$link" : '/.*' > /dev/null; then
    294 -    PRG="$link"
    295 -  else
    296 -    PRG=`dirname "$PRG"`/"$link"
    297 -  fi
    298 -done
    299 -PRGDIR=`dirname "$PRG"`
    300 -#
    301 -
    302 -_classpath="."
    303 -for k in "$PRGDIR"/lib/*.jar
    304 -do
    305 - _classpath="${_classpath}:${k}"
    306 -done
    307 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Jasmin" $@
    308 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jar2Jasmin" $@
    309 --- d2j-jasmin2jar.sh.orig      2013-01-31 23:50:24.000000000 +0100
    310 +++ d2j-jasmin2jar.sh   2013-01-31 23:55:27.000000000 +0100
    311 @@ -17,24 +17,4 @@
    312  # limitations under the License.
    313  #
    314  
    315 -# copy from $Tomcat/bin/startup.sh
    316 -# resolve links - $0 may be a softlink
    317 -PRG="$0"
    318 -while [ -h "$PRG" ] ; do
    319 -  ls=`ls -ld "$PRG"`
    320 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    321 -  if expr "$link" : '/.*' > /dev/null; then
    322 -    PRG="$link"
    323 -  else
    324 -    PRG=`dirname "$PRG"`/"$link"
    325 -  fi
    326 -done
    327 -PRGDIR=`dirname "$PRG"`
    328 -#
    329 -
    330 -_classpath="."
    331 -for k in "$PRGDIR"/lib/*.jar
    332 -do
    333 - _classpath="${_classpath}:${k}"
    334 -done
    335 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jasmin2Jar" $@
    336 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jasmin2Jar" $@
    337 --- dex-dump.sh.orig    2013-01-31 23:50:24.000000000 +0100
    338 +++ dex-dump.sh 2013-01-31 23:55:36.000000000 +0100
    339 @@ -1,23 +1,3 @@
     1--- d2j-apk-sign.sh.orig        2013-02-01 00:21:45.000000000 +0100
     2+++ d2j-apk-sign.sh     2013-02-01 00:22:42.000000000 +0100
     3@@ -17,23 +17,8 @@
     4 # limitations under the License.
     5 #
     6 
     7-# copy from $Tomcat/bin/startup.sh
     8-# resolve links - $0 may be a softlink
     9-PRG="$0"
     10-while [ -h "$PRG" ] ; do
     11-  ls=`ls -ld "$PRG"`
     12-  link=`expr "$ls" : '.*-> \(.*\)$'`
     13-  if expr "$link" : '/.*' > /dev/null; then
     14-    PRG="$link"
     15-  else
     16-    PRG=`dirname "$PRG"`/"$link"
     17-  fi
     18-done
     19-PRGDIR=`dirname "$PRG"`
     20-#
     21-
     22 _classpath="."
     23-for k in "$PRGDIR"/lib/*.jar
     24+for k in @@PREFIX@@/lib/dex2jar/*.jar
     25 do
     26  _classpath="${_classpath}:${k}"
     27 done
     28--- d2j-asm-verify.sh.orig      2013-02-01 00:21:45.000000000 +0100
     29+++ d2j-asm-verify.sh   2013-02-01 00:23:17.000000000 +0100
     30@@ -17,23 +17,8 @@
     31 # limitations under the License.
     32 #
     33 
     34-# copy from $Tomcat/bin/startup.sh
     35-# resolve links - $0 may be a softlink
     36-PRG="$0"
     37-while [ -h "$PRG" ] ; do
     38-  ls=`ls -ld "$PRG"`
     39-  link=`expr "$ls" : '.*-> \(.*\)$'`
     40-  if expr "$link" : '/.*' > /dev/null; then
     41-    PRG="$link"
     42-  else
     43-    PRG=`dirname "$PRG"`/"$link"
     44-  fi
     45-done
     46-PRGDIR=`dirname "$PRG"`
     47-#
     48-
     49 _classpath="."
     50-for k in "$PRGDIR"/lib/*.jar
     51+for k in @@PREFIX@@/lib/dex2jar/*.jar
     52 do
     53  _classpath="${_classpath}:${k}"
     54 done
     55--- d2j-decrpyt-string.sh.orig  2013-02-01 00:21:45.000000000 +0100
     56+++ d2j-decrpyt-string.sh       2013-02-01 00:23:22.000000000 +0100
     57@@ -17,23 +17,8 @@
     58 # limitations under the License.
     59 #
     60 
     61-# copy from $Tomcat/bin/startup.sh
     62-# resolve links - $0 may be a softlink
     63-PRG="$0"
     64-while [ -h "$PRG" ] ; do
     65-  ls=`ls -ld "$PRG"`
     66-  link=`expr "$ls" : '.*-> \(.*\)$'`
     67-  if expr "$link" : '/.*' > /dev/null; then
     68-    PRG="$link"
     69-  else
     70-    PRG=`dirname "$PRG"`/"$link"
     71-  fi
     72-done
     73-PRGDIR=`dirname "$PRG"`
     74-#
     75-
     76 _classpath="."
     77-for k in "$PRGDIR"/lib/*.jar
     78+for k in @@PREFIX@@/lib/dex2jar/*.jar
     79 do
     80  _classpath="${_classpath}:${k}"
     81 done
     82--- d2j-dex-asmifier.sh.orig    2013-02-01 00:21:45.000000000 +0100
     83+++ d2j-dex-asmifier.sh 2013-02-01 00:23:26.000000000 +0100
     84@@ -17,23 +17,8 @@
     85 # limitations under the License.
     86 #
     87 
     88-# copy from $Tomcat/bin/startup.sh
     89-# resolve links - $0 may be a softlink
     90-PRG="$0"
     91-while [ -h "$PRG" ] ; do
     92-  ls=`ls -ld "$PRG"`
     93-  link=`expr "$ls" : '.*-> \(.*\)$'`
     94-  if expr "$link" : '/.*' > /dev/null; then
     95-    PRG="$link"
     96-  else
     97-    PRG=`dirname "$PRG"`/"$link"
     98-  fi
     99-done
     100-PRGDIR=`dirname "$PRG"`
     101-#
     102-
     103 _classpath="."
     104-for k in "$PRGDIR"/lib/*.jar
     105+for k in @@PREFIX@@/lib/dex2jar/*.jar
     106 do
     107  _classpath="${_classpath}:${k}"
     108 done
     109--- d2j-dex-dump.sh.orig        2013-02-01 00:21:45.000000000 +0100
     110+++ d2j-dex-dump.sh     2013-02-01 00:23:27.000000000 +0100
     111@@ -17,23 +17,8 @@
     112 # limitations under the License.
     113 #
     114 
     115-# copy from $Tomcat/bin/startup.sh
     116-# resolve links - $0 may be a softlink
     117-PRG="$0"
     118-while [ -h "$PRG" ] ; do
     119-  ls=`ls -ld "$PRG"`
     120-  link=`expr "$ls" : '.*-> \(.*\)$'`
     121-  if expr "$link" : '/.*' > /dev/null; then
     122-    PRG="$link"
     123-  else
     124-    PRG=`dirname "$PRG"`/"$link"
     125-  fi
     126-done
     127-PRGDIR=`dirname "$PRG"`
     128-#
     129-
     130 _classpath="."
     131-for k in "$PRGDIR"/lib/*.jar
     132+for k in @@PREFIX@@/lib/dex2jar/*.jar
     133 do
     134  _classpath="${_classpath}:${k}"
     135 done
     136--- d2j-dex2jar.sh.orig 2013-02-01 00:21:45.000000000 +0100
     137+++ d2j-dex2jar.sh      2013-02-01 00:23:31.000000000 +0100
     138@@ -17,23 +17,8 @@
     139 # limitations under the License.
     140 #
     141 
     142-# copy from $Tomcat/bin/startup.sh
     143-# resolve links - $0 may be a softlink
     144-PRG="$0"
     145-while [ -h "$PRG" ] ; do
     146-  ls=`ls -ld "$PRG"`
     147-  link=`expr "$ls" : '.*-> \(.*\)$'`
     148-  if expr "$link" : '/.*' > /dev/null; then
     149-    PRG="$link"
     150-  else
     151-    PRG=`dirname "$PRG"`/"$link"
     152-  fi
     153-done
     154-PRGDIR=`dirname "$PRG"`
     155-#
     156-
     157 _classpath="."
     158-for k in "$PRGDIR"/lib/*.jar
     159+for k in @@PREFIX@@/lib/dex2jar/*.jar
     160 do
     161  _classpath="${_classpath}:${k}"
     162 done
     163--- d2j-init-deobf.sh.orig      2013-02-01 00:21:45.000000000 +0100
     164+++ d2j-init-deobf.sh   2013-02-01 00:23:32.000000000 +0100
     165@@ -17,23 +17,8 @@
     166 # limitations under the License.
     167 #
     168 
     169-# copy from $Tomcat/bin/startup.sh
     170-# resolve links - $0 may be a softlink
     171-PRG="$0"
     172-while [ -h "$PRG" ] ; do
     173-  ls=`ls -ld "$PRG"`
     174-  link=`expr "$ls" : '.*-> \(.*\)$'`
     175-  if expr "$link" : '/.*' > /dev/null; then
     176-    PRG="$link"
     177-  else
     178-    PRG=`dirname "$PRG"`/"$link"
     179-  fi
     180-done
     181-PRGDIR=`dirname "$PRG"`
     182-#
     183-
     184 _classpath="."
     185-for k in "$PRGDIR"/lib/*.jar
     186+for k in @@PREFIX@@/lib/dex2jar/*.jar
     187 do
     188  _classpath="${_classpath}:${k}"
     189 done
     190--- d2j-jar-access.sh.orig      2013-02-01 00:21:45.000000000 +0100
     191+++ d2j-jar-access.sh   2013-02-01 00:23:33.000000000 +0100
     192@@ -17,23 +17,8 @@
     193 # limitations under the License.
     194 #
     195 
     196-# copy from $Tomcat/bin/startup.sh
     197-# resolve links - $0 may be a softlink
     198-PRG="$0"
     199-while [ -h "$PRG" ] ; do
     200-  ls=`ls -ld "$PRG"`
     201-  link=`expr "$ls" : '.*-> \(.*\)$'`
     202-  if expr "$link" : '/.*' > /dev/null; then
     203-    PRG="$link"
     204-  else
     205-    PRG=`dirname "$PRG"`/"$link"
     206-  fi
     207-done
     208-PRGDIR=`dirname "$PRG"`
     209-#
     210-
     211 _classpath="."
     212-for k in "$PRGDIR"/lib/*.jar
     213+for k in @@PREFIX@@/lib/dex2jar/*.jar
     214 do
     215  _classpath="${_classpath}:${k}"
     216 done
     217--- d2j-jar-remap.sh.orig       2013-02-01 00:21:45.000000000 +0100
     218+++ d2j-jar-remap.sh    2013-02-01 00:23:35.000000000 +0100
     219@@ -17,23 +17,8 @@
     220 # limitations under the License.
     221 #
     222 
     223-# copy from $Tomcat/bin/startup.sh
     224-# resolve links - $0 may be a softlink
     225-PRG="$0"
     226-while [ -h "$PRG" ] ; do
     227-  ls=`ls -ld "$PRG"`
     228-  link=`expr "$ls" : '.*-> \(.*\)$'`
     229-  if expr "$link" : '/.*' > /dev/null; then
     230-    PRG="$link"
     231-  else
     232-    PRG=`dirname "$PRG"`/"$link"
     233-  fi
     234-done
     235-PRGDIR=`dirname "$PRG"`
     236-#
     237-
     238 _classpath="."
     239-for k in "$PRGDIR"/lib/*.jar
     240+for k in @@PREFIX@@/lib/dex2jar/*.jar
     241 do
     242  _classpath="${_classpath}:${k}"
     243 done
     244--- d2j-jar2dex.sh.orig 2013-02-01 00:21:45.000000000 +0100
     245+++ d2j-jar2dex.sh      2013-02-01 00:23:36.000000000 +0100
     246@@ -17,23 +17,8 @@
     247 # limitations under the License.
     248 #
     249 
     250-# copy from $Tomcat/bin/startup.sh
     251-# resolve links - $0 may be a softlink
     252-PRG="$0"
     253-while [ -h "$PRG" ] ; do
     254-  ls=`ls -ld "$PRG"`
     255-  link=`expr "$ls" : '.*-> \(.*\)$'`
     256-  if expr "$link" : '/.*' > /dev/null; then
     257-    PRG="$link"
     258-  else
     259-    PRG=`dirname "$PRG"`/"$link"
     260-  fi
     261-done
     262-PRGDIR=`dirname "$PRG"`
     263-#
     264-
     265 _classpath="."
     266-for k in "$PRGDIR"/lib/*.jar
     267+for k in @@PREFIX@@/lib/dex2jar/*.jar
     268 do
     269  _classpath="${_classpath}:${k}"
     270 done
     271--- d2j-jar2jasmin.sh.orig      2013-02-01 00:21:45.000000000 +0100
     272+++ d2j-jar2jasmin.sh   2013-02-01 00:23:37.000000000 +0100
     273@@ -17,23 +17,8 @@
     274 # limitations under the License.
     275 #
     276 
     277-# copy from $Tomcat/bin/startup.sh
     278-# resolve links - $0 may be a softlink
     279-PRG="$0"
     280-while [ -h "$PRG" ] ; do
     281-  ls=`ls -ld "$PRG"`
     282-  link=`expr "$ls" : '.*-> \(.*\)$'`
     283-  if expr "$link" : '/.*' > /dev/null; then
     284-    PRG="$link"
     285-  else
     286-    PRG=`dirname "$PRG"`/"$link"
     287-  fi
     288-done
     289-PRGDIR=`dirname "$PRG"`
     290-#
     291-
     292 _classpath="."
     293-for k in "$PRGDIR"/lib/*.jar
     294+for k in @@PREFIX@@/lib/dex2jar/*.jar
     295 do
     296  _classpath="${_classpath}:${k}"
     297 done
     298--- d2j-jasmin2jar.sh.orig      2013-02-01 00:21:45.000000000 +0100
     299+++ d2j-jasmin2jar.sh   2013-02-01 00:23:38.000000000 +0100
     300@@ -17,23 +17,8 @@
     301 # limitations under the License.
     302 #
     303 
     304-# copy from $Tomcat/bin/startup.sh
     305-# resolve links - $0 may be a softlink
     306-PRG="$0"
     307-while [ -h "$PRG" ] ; do
     308-  ls=`ls -ld "$PRG"`
     309-  link=`expr "$ls" : '.*-> \(.*\)$'`
     310-  if expr "$link" : '/.*' > /dev/null; then
     311-    PRG="$link"
     312-  else
     313-    PRG=`dirname "$PRG"`/"$link"
     314-  fi
     315-done
     316-PRGDIR=`dirname "$PRG"`
     317-#
     318-
     319 _classpath="."
     320-for k in "$PRGDIR"/lib/*.jar
     321+for k in @@PREFIX@@/lib/dex2jar/*.jar
     322 do
     323  _classpath="${_classpath}:${k}"
     324 done
     325--- dex-dump.sh.orig    2013-02-01 00:21:45.000000000 +0100
     326+++ dex-dump.sh 2013-02-01 00:24:00.000000000 +0100
     327@@ -1,22 +1,7 @@
    340328 #!/bin/sh
    341329 
     
    355343-#
    356344-
    357 -_classpath="."
    358 -for k in "$PRGDIR"/lib/*.jar
    359 -do
    360 - _classpath="${_classpath}:${k}"
    361 -done
    362 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.Dump" $1 $2 $3 $4 $5 $6
    363 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.Dump" $1 $2 $3 $4 $5 $6
    364 --- dex2jar.sh.orig     2013-01-31 23:50:24.000000000 +0100
    365 +++ dex2jar.sh  2013-01-31 23:55:41.000000000 +0100
    366 @@ -17,24 +17,4 @@
    367  # limitations under the License.
    368  #
    369  
    370 -# copy from $Tomcat/bin/startup.sh
    371 -# resolve links - $0 may be a softlink
    372 -PRG="$0"
    373 -while [ -h "$PRG" ] ; do
    374 -  ls=`ls -ld "$PRG"`
    375 -  link=`expr "$ls" : '.*-> \(.*\)$'`
    376 -  if expr "$link" : '/.*' > /dev/null; then
    377 -    PRG="$link"
    378 -  else
    379 -    PRG=`dirname "$PRG"`/"$link"
    380 -  fi
    381 -done
    382 -PRGDIR=`dirname "$PRG"`
    383 -#
    384 -
    385 -_classpath="."
    386 -for k in "$PRGDIR"/lib/*.jar
    387 -do
    388 - _classpath="${_classpath}:${k}"
    389 -done
    390 -java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.v3.Main" $@
    391 +java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.v3.Main" $@
     345 _classpath="."
     346-for k in "$PRGDIR"/lib/*.jar
     347+for k in @@PREFIX@@/lib/dex2jar/*.jar
     348 do
     349  _classpath="${_classpath}:${k}"
     350 done
     351--- dex2jar.sh.orig     2013-02-01 00:21:45.000000000 +0100
     352+++ dex2jar.sh  2013-02-01 00:23:43.000000000 +0100
     353@@ -17,23 +17,8 @@
     354 # limitations under the License.
     355 #
     356 
     357-# copy from $Tomcat/bin/startup.sh
     358-# resolve links - $0 may be a softlink
     359-PRG="$0"
     360-while [ -h "$PRG" ] ; do
     361-  ls=`ls -ld "$PRG"`
     362-  link=`expr "$ls" : '.*-> \(.*\)$'`
     363-  if expr "$link" : '/.*' > /dev/null; then
     364-    PRG="$link"
     365-  else
     366-    PRG=`dirname "$PRG"`/"$link"
     367-  fi
     368-done
     369-PRGDIR=`dirname "$PRG"`
     370-#
     371-
     372 _classpath="."
     373-for k in "$PRGDIR"/lib/*.jar
     374+for k in @@PREFIX@@/lib/dex2jar/*.jar
     375 do
     376  _classpath="${_classpath}:${k}"
     377 done
Note: See TracChangeset for help on using the changeset viewer.