たまにっき。 / 2002-07-12
| 日 | 月 | 火 | 水 | 木 | 金 | 土 |
|---|---|---|---|---|---|---|
| 1 | 2 | 3 | 4 | 5 | 6 | |
| 7 | 8 | 9 | 10 | 11 | 12 | 13 |
| 14 | 15 | 16 | 17 | 18 | 19 | 20 |
| 21 | 22 | 23 | 24 | 25 | 26 | 27 |
| 28 | 29 | 30 | 31 |
2002-07-12 Fri
■ Windows + Cygwin 上での ant 1.5 のバグフィックス．
作った後に気付く．jakarta から似たようなパッチが出てる．
悔しいので，パッチ同士，diff を取る．
--- bin/ant.old 2002-07-10 00:13:56.000000000 +0900
+++ bin/ant 2002-07-12 10:15:22.000000000 +0900
@@ -102,7 +102,11 @@
fi
if [ -n "$CLASSPATH" ] ; then
+ if $cygwin ; then
+ LOCALCLASSPATH=`cygpath --unix "$CLASSPATH"`
+ else
LOCALCLASSPATH="$CLASSPATH"
+ fi
fi
# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
@@ -111,14 +115,22 @@
for i in ant ant-optional jaxp_parser xml_apis
do
if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$JAVALIBDIR/$i.jar
+ if $cygwin ; then
+ LOCALCLASSPATH=`cygpath --unix "$JAVALIBDIR/$i.jar"`
else
- LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
+ LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
+ fi
+ else
+ if $cygwin ; then
+ LOCALCLASSPATH=`cygpath --unix "$JAVALIBDIR/$i.jar"`:"$LOCALCLASSPATH"
+ else
+ LOCALCLASSPATH="$JAVALIBDIR/$i.jar:$LOCALCLASSPATH"
+ fi
fi
done
@@ -129,20 +141,20 @@
# this is stupid, so case for it
if [ "$i" != "${ANT_LIB}/*.jar" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$i
+ LOCALCLASSPATH=`cygpath --unix $i`
else
- LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
+ LOCALCLASSPATH=`cygpath --unix "$i"`:"$LOCALCLASSPATH"
fi
fi
done
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+ LOCALCLASSPATH="$LOCALCLASSPATH":`cygpath --unix "$JAVA_HOME/lib/tools.jar"`
fi
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+ LOCALCLASSPATH="$LOCALCLASSPATH":`cygpath --unix "$JAVA_HOME/lib/classes.zip"`
fi
# OSX hack to make Ant work with jikes
パッチ同士の diff．
--- hoge.patch 2002-08-29 13:41:04.000000000 +0900
+++ aaa.diff 2002-08-29 13:43:14.000000000 +0900
@@ -1,59 +1,37 @@
---- bin/ant.old 2002-07-10 00:13:56.000000000 +0900
-+++ bin/ant 2002-07-12 10:15:22.000000000 +0900
-@@ -102,7 +102,11 @@
- fi
-
- if [ -n "$CLASSPATH" ] ; then
-+ if $cygwin ; then
-+ LOCALCLASSPATH=`cygpath --unix "$CLASSPATH"`
-+ else
- LOCALCLASSPATH="$CLASSPATH"
-+ fi
- fi
-
- # in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
-@@ -111,14 +115,22 @@
- for i in ant ant-optional jaxp_parser xml_apis
- do
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH=$JAVALIBDIR/$i.jar
-+ if $cygwin ; then
-+ LOCALCLASSPATH=`cygpath --unix "$JAVALIBDIR/$i.jar"`
- else
-- LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
-+ fi
-+ else
-+ if $cygwin ; then
-+ LOCALCLASSPATH=`cygpath --unix "$JAVALIBDIR/$i.jar"`:"$LOCALCLASSPATH"
-+ else
-+ LOCALCLASSPATH="$JAVALIBDIR/$i.jar:$LOCALCLASSPATH"
-+ fi
- fi
- done
-
-@@ -129,20 +141,20 @@
- # this is stupid, so case for it
- if [ "$i" != "${ANT_LIB}/*.jar" ] ; then
- if [ -z "$LOCALCLASSPATH" ] ; then
-- LOCALCLASSPATH=$i
-+ LOCALCLASSPATH=`cygpath --unix $i`
- else
-- LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
-+ LOCALCLASSPATH=`cygpath --unix "$i"`:"$LOCALCLASSPATH"
- fi
+--- /usr/local/java/ant/bin/ant.old 2002-07-10 00:13:56.000000000 +0900
++++ ant 2002-07-15 20:30:27.000000000 +0900
+@@ -39,8 +39,8 @@
+ ANT_HOME=/opt/ant
fi
- done
- if [ -n "$JAVA_HOME" ] ; then
- if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
-+ LOCALCLASSPATH="$LOCALCLASSPATH":`cygpath --unix "$JAVA_HOME/lib/tools.jar"`
+- if [ -d ${HOME}/opt/ant ] ; then
+- ANT_HOME=${HOME}/opt/ant
++ if [ -d "${HOME}/opt/ant" ] ; then
++ ANT_HOME="${HOME}/opt/ant"
fi
- if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
-+ LOCALCLASSPATH="$LOCALCLASSPATH":`cygpath --unix "$JAVA_HOME/lib/classes.zip"`
- fi
+ ## resolve links - $0 may be a link to ant's home
+@@ -66,12 +66,9 @@
+ # make it fully qualified
+ ANT_HOME=`cd "$ANT_HOME" && pwd`
+
+- cd $saveddir
++ cd "$saveddir"
+ fi
+
+-# set ANT_LIB location
+-ANT_LIB=${ANT_HOME}/lib
+-
+ # For Cygwin, ensure paths are in UNIX format before anything is touched
+ if $cygwin ; then
+ [ -n "$ANT_HOME" ] &&
+@@ -82,6 +79,9 @@
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+ fi
- # OSX hack to make Ant work with jikes
++# set ANT_LIB location
++ANT_LIB=${ANT_HOME}/lib
++
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
わけわからん．
[ 固定リンク |
コメント |
トラックバック ()
| 
]
]
[
コメント |
トラックバック
()
]
2008 : 01 02 03 04 05 06 07 08 09 10 11 12
2007 : 01 02 03 04 05 06 07 08 09 10 11 12
2006 : 01 02 03 04 05 06 07 08 09 10 11 12
2005 : 01 02 03 04 05 06 07 08 09 10 11 12
2004 : 01 02 03 04 05 06 07 08 09 10 11 12
2003 : 01 02 03 04 05 06 07 08 09 10 11 12
2002 : 01 02 03 04 05 06 07 08 09 10 11 12
2001 : 01 02 03 04 05 06 07 08 09 10 11 12
最終更新時間: 2008-09-04 19:19
Powered by 
