Changeset 25684

Timestamp:

2012-05-28T23:47:41+12:00 (12 years ago)

Author:

davidb

Message:

Improved reporting of what processing was undertaken, and other adjustments to make the scripts work on Cygwin under Windows

Location:

other-projects/gli-rsyntax-textarea

Files:

• COMPILE.sh (added)
• INSTALL.sh (added)
• REGENERATE-FLEX.sh (modified) (2 diffs)
• devel.bash (modified) (1 diff)

other-projects/gli-rsyntax-textarea/REGENERATE-FLEX.sh

@@ -1 +1 @@
 #!/bin/bash
 
-pushd src/java/org/fife/ui/rsyntaxtextarea/modes/
+pushd src/java/org/fife/ui/rsyntaxtextarea/modes/ > /dev/null
+
+
+editedFlex=0;
+unchangedFlex=0;
+
+flex_jar=$GEXTRSYNTAX/lib/JFlex.jar
+
+if [ "x$GSDLOS" = "xcygwin" ] ; then
+  flex_jar=`cygpath -w $flex_jar | sed 's/\\\\/\\\\\\\\/g'`
+elif [ "x$GSDLOS" = "xmingw" ] ; then
+  flex_jar=`echo $flex_jar | sed 's/^\/\(.\)/\1:/' | sed 's@/@\\\\@g'`
+fi
 
 
 for f in *.flex ; do
-  echo "Checking $f ..."
-  if [ $f -nt ${f%.*}.java ] ; then
-    jflex $f
-    echo "... regenerated"
+#  echo "Checking $f ..."
+  j="${f%.*}.java"
+  if [ "$f" -nt "$j" ] ; then
+    echo ""
+    echo "****"
+    echo "* Regenerating $f"
+    echo "****"
+    echo ""
+
+    java -cp "$flex_jar" JFlex.Main $f
+    #bash -x jflex $f
+
+    cat $j \
+      | sed 's/yyreset/YYRESETOLD/g' \
+      | sed 's/YYRESETNEW/yyreset/g' \
+      | sed 's/zzRefill/YYREFILLOLD/g' \
+      | sed 's/ZZREFILLNEW/zzRefill/g' \
+      > $j.new    
+
+    /bin/mv $j.new $j
+    ((editedFlex +=1))
+
   else 
-    echo "... does not need to be regenerated"
+#    echo "... does not need to be regenerated"
+    ((unchangedFlex +=1))
   fi
 
@@ -16 +47 @@
 done
 
-popd
+echo "===="
+echo "$unchangedFlex Flex files unchanged"
+echo ""
+
+if [ $editedFlex -ge "1" ] ; then
+  echo ""
+  echo "****"
+  echo "* $editedFlex flex file(s) regenerated."
+  echo "* Use ./COMPILE.sh to recompile the modified code and regenerate the jar file"
+  echo "****"
+  echo ""
+fi
+
+popd > /dev/null
+

other-projects/gli-rsyntax-textarea/devel.bash

@@ -5 +5 @@
 fulldir=${full_setup%/*}
 fulldir=${fulldir%/.}
+
+if [ "x$GSDLOS" = "x" ] ; then
+  export GSDLOS=`uname | sed 's/^cygwin.*$/cygwin/i' | sed 's/^mingw.*$/mingw/i'`
+fi
 
 ##source cascade-make/lib/cascade-lib.bash