harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r565126 - /harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh
Date Sun, 12 Aug 2007 19:41:00 GMT
Author: dlydick
Date: Sun Aug 12 12:40:59 2007
New Revision: 565126

URL: http://svn.apache.org/viewvc?view=rev&rev=565126
Log:
Corrected misc. logic.

Renamed argument processing from 'argv.c' to 'jvmargv.c'

Enhanced numerous narratives and explanations.

Modified:
    harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh

Modified: harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh
URL: http://svn.apache.org/viewvc/harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh?view=diff&rev=565126&r1=565125&r2=565126
==============================================================================
--- harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh (original)
+++ harmony/enhanced/sandbox/bootjvm/bootJVM/config.sh Sun Aug 12 12:40:59 2007
@@ -522,9 +522,8 @@
 $echon "more... $echoc"
 read dummy
 echo ""
-
 HAVE_MAKEDEPEND=0
-if test -z "`which makedepend`"
+if test -n "`which makedepend`"
 then
     HAVE_MAKEDEPEND=1
 else
@@ -539,7 +538,7 @@
     echo ""
 fi
 HAVE_CTAGS=0
-if test -z "`which ctags`"
+if test -n "`which ctags`"
 then
     HAVE_CTAGS=1
 else
@@ -816,7 +815,7 @@
 
     case $heapalloc in
         simple)  HEAPALLOC="HEAP_TYPE_SIMPLE";;
-        bimodal) HEAPALLOC="HEAP_TYPE_SIMPLE";;
+        bimodal) HEAPALLOC="HEAP_TYPE_BIMODAL";;
         other)   HEAPALLOC="HEAP_TYPE_OTHER";;
 
         *)       echo ""
@@ -937,7 +936,7 @@
 echo ""
 echo "    jvm--   Build the main development area as 'bootjvm'"
 echo "    libjvm--Build the static JVM library as 'libjvm.a'"
-echo "    main--  Build the sample main() program (links 'libjvm.a')"
+echo "    main--  Build the sample JVM main() program(links 'libjvm.a')"
 echo "    test--  Build the Java test code area as 'bootjvm'"
 echo "    jni--   Build the sample JNI code area (links 'libjvm.a')"
 echo "    dox--   Build the documentation as 'doc' (using doxygen)"
@@ -960,7 +959,7 @@
 
 MSG80JVM="jvm:  $SHOULDBUILD the main development area?"
 MSG80LIB="lib:  $SHOULDBUILD the static JVM library?"
-MSG80MAIN="main: $SHOULDBUILD the sample main() program?"
+MSG80MAIN="main: $SHOULDBUILD the sample JVM main() program?"
 MSG80TEST="test: $SHOULDBUILD the Java test code area?"
 MSG80JNI="jni:  $SHOULDBUILD the sample JNI code area?"
 MSG80DOX="dox:  $SHOULDBUILD the documentation area?"
@@ -1010,8 +1009,8 @@
 
            echo  ""
            $echon "$MSG80TEST [y,n] $echoc"
-           read buildmain
-           case $buildmain in
+           read buildtest
+           case $buildtest in
                y|ye|yes|Y|YE|YES) BUILD_TEST=1;;
                *)                 BUILD_TEST=0;;
            esac
@@ -1580,7 +1579,7 @@
     echo " * @todo  HARMONY-6-config.sh-5 Put fuller definition for"
     echo " *        this symbol and its usage into the code in"
     echo " *        @link jvm/src/classpath.c classpath.c @endlink"
-    echo " *        and @link jvm/src/argv.c argv.c @endlink."
+    echo " *        and @link jvm/src/jvmargv.c jvmargv.c @endlink."
     echo " *"
     echo " * @todo  HARMONY-6-config.sh-6 Remove compiled absolute path"
     echo " *        name in favor or either a relative path name or"
@@ -1614,24 +1613,23 @@
     echo "#define CONFIG_CCOMPILER_$CCOMPILER"
   fi
 
+  echo ""
   if test -z "$HEAPALLOC"
   then
-    echo ""
     echo "/*!"
     echo " * @internal There is no heap allocation method configured"
     echo " *"
     echo " */"
   else
-    echo ""
     echo "/*!"
-    echo " * @def CONFIG_$HEAPALLOC"
-    echo " * @brief Heap allocation method"
+    echo " * @def CONFIG_HEAP_TYPE"
+    echo " * @brief Specific heap allocation method macro"
     echo " *"
     echo " * This value may be @b simple or @b bimodal or @b other."
     echo " *"
     echo " * @b simple means @c @b malloc(3)/free(3) only"
     echo " *"
-  echo " * @b bimodal means @c @b malloc(3)/free(3) plus a large buffer"
+    echo " * @b bimodal means smart buffer scheme plus @c @b malloc(3)/free(3)"
     echo " *"
     echo " * @b other means roll your own-- generates unresolved"
     echo " *          external symbols."
@@ -1640,26 +1638,47 @@
     echo " * @link jvm/src/heap_bimodal.c heap_bimodal.c@endlink"
     echo " * for a good example as to how to implement the heap API and"
     echo " * incorporate it into the suite of heap allocation options."
+    echo " * The heap allocation API is similarly implemented."
+   echo " * Remember also to update @link jvm/src/heap.h heap.h@endlink"
+    echo " * when adding a heap allocation algorithm."
     echo " * Remember also to add it to"
     echo " * @link ./$PGMNAME $PGMNAME@endlink"
     echo " * so others may configure and use it."
     echo " *"
+   echo " * Useful for diagnostic strings that report heap information."
+    echo " *"
+    echo " *"
+    echo " * @see CONFIG_$HEAPALLOC"
+    echo " *"
+    echo " */"
+    echo "#define CONFIG_HEAP_TYPE $heapalloc"
+    echo ""
+    echo "/*!"
+    echo " * @def CONFIG_$HEAPALLOC"
+    echo " * @brief Heap allocation method token macro"
+    echo " *"
+    echo " * This symbol is named after the heap allocation method and"
+    echo " * is useful in certain source code contexts where the more"
+echo " * general macro @link #CONFIG_HEAP_TYPE CONFIG_HEAP_TYPE@endlink"
+    echo " * is not."
+    echo " *"
+    echo " * @see CONFIG_HEAP_TYPE"
+    echo " *"
     echo " */"
     echo "#define CONFIG_$HEAPALLOC"
   fi
 
+  echo ""
   if test -z "$GCMETHOD"
   then
-    echo ""
     echo "/*!"
     echo " * @internal There is no garbage collection method configured"
     echo " *"
     echo " */"
   else
-    echo ""
     echo "/*!"
     echo " * @def CONFIG_$GCMETHOD"
-    echo " * @brief Garbage collection method"
+    echo " * @brief Specific garbage collection method macro"
     echo " *"
     echo " * This value may be @b stub or @b refcount or @b other."
     echo " *"
@@ -1671,19 +1690,41 @@
     echo " *          external symbols."
     echo " *"
     echo " * Refer to"
-    echo " * @link jvm/src/heap_bimodal.c heap_bimodal.c@endlink"
-    echo " * for a good example as to how to implement the heap API and"
-    echo " * incorporate it into the suite of heap allocation options."
-    echo " * The garbage collection API is similarly implemented."
+    echo " * @link jvm/src/gc_refcount.c gc_refcount.c@endlink"
+    echo " * for a good example as to how to implement the GC API and"
+    echo " * incorporate it into the suite of GC options."
+    echo " * The heap allocation API is similarly implemented."
+    echo " * Remember also to update @link jvm/src/gc.h gc.h@endlink"
+    echo " * when adding a garbage collection algorithm."
     echo " * Remember also to add it to"
     echo " * @link ./$PGMNAME $PGMNAME@endlink"
     echo " * so others may configure and use it."
     echo " *"
+    echo " * Useful for diagnostic strings that report garbage"
+    echo " * collection information."
+    echo " *"
+    echo " * @see CONFIG_$GCMETHOD"
+    echo " *"
+    echo " */"
+    echo "#define CONFIG_GC_TYPE $gcmethod"
+    echo ""
+    echo "/*!"
+    echo " * @def CONFIG_$GCMETHOD"
+    echo " * @brief Garbage collection method token macro"
+    echo " *"
+    echo " * This symbol is named after the heap allocation method and"
+    echo " * is useful in certain source code contexts where the more"
+    echo " * general macro @link #CONFIG_GC_TYPE CONFIG_GC_TYPE@endlink"
+    echo " * is not."
+    echo " *"
+    echo " * @see CONFIG_GC_TYPE"
+    echo " *"
     echo " */"
     echo "#define CONFIG_$GCMETHOD"
   fi
 
-    echo "/* EOF */"
+  echo ""
+  echo "/* EOF */"
 
 ) > $CFGH
 



Mime
View raw message