commit 4ec21527096d0dcaa99634e6058aca3a415461af
author Jack Palevich Thu Apr 02 23:05:05 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 02 23:05:05 2009 -0700
tree c75d4bbbcc51bb78fc7c8064505f92fa563f1748
parent 42781c76fc8174a5c64218d69542a98082d6a552

AI 144401: am: CL 144282 Tweak this tool to work with the current directory structure.
  Also leave the "generated" directory around if it contains files that
  need to be checked in.
  Original author: jackpal

Automated import of CL 144401

opengl/tools/glgen/gen

diff --git a/opengl/tools/glgen/gen b/opengl/tools/glgen/gen
index 1c49861..c060040 100755
--- a/opengl/tools/glgen/gen
+++ b/opengl/tools/glgen/gen
@@ -31,13 +31,15 @@
 cp -r out/javax generated
 
 rm -rf out
+KEEP_GENERATED=0
 
 # com_google_android_gles_jni_GLImpl.cpp
-if cmp ../../../frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp generated/C/com_google_android_gles_jni_GLImpl.cpp ; then
+if cmp ../../../../../frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp generated/C/com_google_android_gles_jni_GLImpl.cpp ; then
 echo com_google_android_gles_jni_GLImpl.cpp unchanged
 else
-echo Please edit ../../../frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp
-echo Please cp generated/C/com_google_android_gles_jni_GLImpl.cpp ../../../frameworks/base/core/jni
+echo Please p4 edit ../../../../../frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp
+echo Please cp generated/C/com_google_android_gles_jni_GLImpl.cpp ../../../../../frameworks/base/core/jni
+KEEP_GENERATED=1
 fi
 
 # GLImpl.java
@@ -46,6 +48,7 @@
 else
 echo Please edit ../../java/com/google/android/gles_jni/GLImpl.java
 echo Please cp generated/com/google/android/gles_jni/GLImpl.java ../../java/com/google/android/gles_jni
+KEEP_GENERATED=1
 fi
 
 # GL.java
@@ -54,6 +57,7 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL.java ../../java/javax/microedition/khronos/opengles/GL.java
+KEEP_GENERATED=1
 fi
 
 # GL10.java
@@ -62,6 +66,7 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL10.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL10.java ../../java/javax/microedition/khronos/opengles/GL10.java
+KEEP_GENERATED=1
 fi
 
 # GL10Ext.java
@@ -70,6 +75,7 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL10Ext.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL10Ext.java ../../java/javax/microedition/khronos/opengles/GL10Ext.java
+KEEP_GENERATED=1
 fi
 
 # GL11.java
@@ -78,6 +84,7 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL11.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL11.java ../../java/javax/microedition/khronos/opengles/GL11.java
+KEEP_GENERATED=1
 fi
 
 # GL11Ext.java
@@ -86,6 +93,7 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL11Ext.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL11Ext.java ../../java/javax/microedition/khronos/opengles/GL11Ext.java
+KEEP_GENERATED=1
 fi
 
 # GL11ExtensionPack.java
@@ -94,6 +102,9 @@
 else
 echo Please edit ../../java/javax/microedition/khronos/opengles/GL11ExtensionPack.java
 echo Please cp generated/javax/microedition/khronos/opengles/GL11ExtensionPack.java ../../java/javax/microedition/khronos/opengles/GL11ExtensionPack.java
+KEEP_GENERATED=1
 fi
 
+if [ $KEEP_GENERATED == "0" ] ; then
 rm -rf generated
+fi