packages: polyglot/polyglot.spec, polyglot/classpath.patch (NEW) - fix clas...

[baggins]

Author: baggins                      Date: Thu Jul  7 09:27:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix classpath in scripts

---- Files affected:
packages/polyglot:
   polyglot.spec (1.7 -> 1.8) , classpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/polyglot/polyglot.spec
diff -u packages/polyglot/polyglot.spec:1.7 packages/polyglot/polyglot.spec:1.8
--- packages/polyglot/polyglot.spec:1.7	Thu Jul  7 11:00:06 2011
+++ packages/polyglot/polyglot.spec	Thu Jul  7 11:27:19 2011
@@ -7,13 +7,14 @@
 Summary(pl.UTF-8):	Szkielet frontendu kompilatora do tworzenia rozszerzeń Javy
 Name:		polyglot
 Version:	2.4.0
-Release:	0.2
+Release:	0.3
 License:	Apache v1.1
 Group:		Development/Languages/Java
 Source0:	http://www.cs.cornell.edu/Projects/polyglot/src/%{name}-%{version}-src.tar.gz
 # Source0-md5:	6a56a2a30ed3b164112a6caaddc6edb3
 Source1:	http://www.cs.cornell.edu/Projects/polyglot/eclipseUpdates/plugins/%{name}_%{version}.jar
 # Source1-md5:	c54716cc0412f08ce2a97e88934d064b
+Patch0:		classpath.patch
 URL:		http://www.cs.cornell.edu/Projects/polyglot/
 BuildRequires:	ant >= 1.6.5-4
 BuildRequires:	jflex
@@ -70,6 +71,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
+%patch0 -p1
 
 %build
 required_jars='ant'
@@ -91,8 +93,8 @@
 install -d $RPM_BUILD_ROOT{%{_javadir}/%{name},%{_bindir}} \
 	$RPM_BUILD_ROOT%{_eclipseplugindir}/features
 
-sed -e "s|TOP=.*|TOP='%{_javadir}'|" bin/jlc > $RPM_BUILD_ROOT%{_bindir}/jlc
-sed -e "s|TOP=.*|TOP='%{_javadir}'|" bin/pth > $RPM_BUILD_ROOT%{_bindir}/pth
+%{__sed} -e "s|@dir@|%{_javadir}|g" bin/jlc > $RPM_BUILD_ROOT%{_bindir}/jlc
+%{__sed} -e "s|@dir@|%{_javadir}|g" bin/pth > $RPM_BUILD_ROOT%{_bindir}/pth
 
 install lib/{java_cup,polyglot,pth,ppg}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
 install examples/coffer/lib/coffer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -123,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/07/07 09:27:19  baggins
+- fix classpath in scripts
+
 Revision 1.7  2011/07/07 09:00:06  baggins
 - disabled eclipse plugin with a TODO
 

================================================================
Index: packages/polyglot/classpath.patch
diff -u /dev/null packages/polyglot/classpath.patch:1.1
--- /dev/null	Thu Jul  7 11:27:24 2011
+++ packages/polyglot/classpath.patch	Thu Jul  7 11:27:19 2011
@@ -0,0 +1,119 @@
+--- polyglot-2.4.0-src/bin/jlc.orig	2008-08-14 17:46:38.000000000 +0200
++++ polyglot-2.4.0-src/bin/jlc	2011-07-07 11:12:26.186199047 +0200
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+ 
+-prg=`basename "$0"`
+-dir=`dirname "$0"`/..
+-
+ usage() {
+   polyglot -h
+   cat <<EOF
+@@ -28,31 +25,12 @@
+   fi
+ }
+ 
+-unixfilename() {
+-  windows=0
+-
+-  if [ `uname | grep -c CYGWIN` -ne 0 ]; then
+-    windows=1
+-  fi
+-
+-  cp="$1"
+-
+-  if [ "$windows" = 1 ]; then 
+-    cygpath -u "$cp"
+-  else
+-    echo "$cp"
+-  fi
+-}
+-
+-
+ extra_cp=
+ args=
+ vmargs=
+ classpath=
+ java=java
+ 
+-dir=`unixfilename "$dir"`
+-
+ while true; do
+     case "$1" in
+         "")
+@@ -98,9 +76,9 @@
+ fi
+ 
+ 
+-classpath="$dir/classes:$dir/lib/polyglot.jar:$dir/lib/java_cup.jar"
++classpath="@dir@:@dir@/polyglot:@dir@/polyglot/polyglot.jar:@dir@/polyglot/java_cup.jar"
+ if [ -n "$ext" ]; then
+-  classpath="$classpath:$dir/lib/$ext.jar"
++  classpath="$classpath:@dir@/polyglot/$ext.jar:@dir@/$ext.jar"
+ fi
+ classpath="$classpath:$extra_cp"
+ classpath=`fixclasspath "$classpath"`
+@@ -115,5 +93,5 @@
+   echo "$java" "$vmargs" -classpath "'$classpath'" polyglot.main.Main -classpath "'$classpath'" "$args"
+ fi
+ 
+-  eval "$java" "$vmargs" -classpath "'$classpath'" polyglot.main.Main -classpath "'$classpath'" "$args"
++exec "$java" "$vmargs" -classpath "'$classpath'" polyglot.main.Main -classpath "'$classpath'" "$args"
+ 
+--- polyglot-2.4.0-src/bin/pth.orig	2008-08-14 17:46:38.000000000 +0200
++++ polyglot-2.4.0-src/bin/pth	2011-07-07 11:11:54.931613263 +0200
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+ 
+-prg=`basename "$0"`
+-dir=`dirname "$0"`/..
+-
+ usage() {
+   polyglot -h
+   cat <<EOF
+@@ -27,19 +24,6 @@
+   fi
+ }
+ 
+-unixfilename() {
+-  if [ `uname | grep -c CYGWIN` -ne 0 ]; then
+-    windows=1
+-  fi
+-
+-  cp="$1"
+-  if [ "$windows" = 1 ]; then 
+-    cygpath -u "$cp"
+-  else
+-    echo "$cp"
+-  fi
+-}
+-
+ unixpath() {
+   if [ `uname | grep -c CYGWIN` -ne 0 ]; then
+     windows=1
+@@ -64,8 +48,6 @@
+   eval "$java" "$vmargs" -classpath "'$classpath'" polyglot.pth.Main "$@"
+ }
+ 
+-dir=`unixfilename "$dir"`
+-
+ while true; do
+     case "$1" in
+         "")
+@@ -103,8 +85,8 @@
+     esac
+ done
+ 
+-classpath="$dir/classes:$dir/lib/polyglot.jar:$dir/lib/java_cup.jar"
+-classpath="$classpath:$dir/tools/pth/classes:$dir/tools/lib/pth.jar"
++classpath="@dir@:@dir@/polyglot:@dir@/polyglot/polyglot.jar:@dir@/polyglot/java_cup.jar"
++classpath="$classpath:@dir@/polyglot/pth.jar"
+ classpath="$classpath:$extra_cp"
+ classpath=`fixclasspath "$classpath"`
+ 
+@@ -117,4 +99,4 @@
+   echo "$java" "$vmargs" -classpath "'$classpath'" polyglot.main.Main "$@"
+ fi
+ 
+-polyglot "$args"
++exec polyglot "$args"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/polyglot/polyglot.spec?r1=1.7&r2=1.8&f=u