You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by dl...@apache.org on 2005/10/28 10:59:59 UTC
svn commit: r329162 -
/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/
Author: dlydick
Date: Fri Oct 28 01:59:03 2005
New Revision: 329162
URL: http://svn.apache.org/viewcvs?rev=329162&view=rev
Log:
Regularization of script naming conventions
and header paths, including references to
'make XXX' rules instead of to old build
scripts.
Added:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh
- copied, changed from r326448, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/common.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh
- copied, changed from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/commondox.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh
- copied, changed from r326458, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox_filter.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh
- copied, changed from r326459, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxpatch.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh
- copied, changed from r326459, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxunpatch.sh
Removed:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/common.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/commondox.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox_filter.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxpatch.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxunpatch.sh
Modified:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-bin.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-doc.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-src.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndata.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndups.sh
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox Fri Oct 28 01:59:03 2005
@@ -161,7 +161,7 @@
# with such work, re-enable this
# parameter and rebuild all docs.
#
-INPUT_FILTER = dox_filter.sh
+INPUT_FILTER = dox-filter.sh
# FILTER_PATTERNS =
FILTER_SOURCE_FILES = YES
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-bin.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-bin.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-bin.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-bin.sh Fri Oct 28 01:59:03 2005
@@ -6,8 +6,8 @@
# @brief Distribute Boot JVM binary package, including documentation.
#
# Make @e sure to have performed the final build by running
-# @link ./clean.sh clean.sh all@endlink followed by
-# @link ./build.sh build.sh all@endlink. This will guarantee
+# @link ./Makefile make veryclean@endlink followed by
+# @link ./Makefile make all@endlink. This will guarantee
# that everything compiles clean and may be installed and
# run on all platforms of this CPU type.
#
@@ -17,7 +17,7 @@
# Use @link ./dist-doc.sh dist-doc.sh@endlink to distribute
# the documentation package.
#
-# @see @link ./common.sh ./common.sh@endlink
+# @see @link ./dist-common.sh ./dist-common.sh@endlink
#
# @attention Make @e sure that all Eclipse project files are in
# the "open" state when creating a distribution.
@@ -25,20 +25,19 @@
# Eclipse users without having to change anything.
#
# @todo HARMONY-6-dist-bin.sh-1 This script should probably support each
-# and every CPU platform that implements this code instad of
+# and every CPU platform that implements this code instead of
# having just a single output location for each file. However,
-# that also involves changes to @link ./build.sh build.sh@endlink
-# and @link ./clean.sh clean.sh@endlink and
-# @link ./common.sh common.sh@endlink, as well as
+# that also involves changes to
+# @link ./MakeRules ./MakeRules@endlink, as well as
# @link ./config.sh config.sh@endlink. This is left as an
# exercise for the project team. For an example of such a
# multi-host script, consider that the original development was
# done on a Solaris platform. Such distribution should be built
-# using @link ./clean.sh ./clean.sh all@endlink followed by
-# @link ./build.sh ./build.sh all@endlink and should contain
-# all formats of documentation. If no CPU-specific directory
-# level were implemented, result should look like the current
-# distribution:
+# using @link ./Makefile make veryclean@endlink followed by
+# @link ./Makefile make all@endlink (both in the top level
+# directory) and should contain all formats of documentation.
+# If no CPU-specific directory level were implemented, result
+# should look like the current distribution:
#
# <ul>
#
@@ -127,7 +126,7 @@
#
. echotest.sh
-. common.sh
+. dist-common.sh
MSG80="This script must NOT be interrupted. Last chance to stop it..."
$echon "$PGMNAME: $MSG80" $echoc
@@ -146,16 +145,16 @@
DistChkTarget
-./clean.sh all
+make veryclean
DistPrep
# Build everything but the documentation
-./build.sh jvm
-./build.sh libjvm
-./build.sh main
-./build.sh test
-./build.sh jni
+make jvm
+make libjvm
+make main
+make test
+make jni
echo ""
echo "$PGMNAME: Setting target directory permissions"
Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh (from r326448, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/common.sh)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/common.sh&r1=326448&r2=329162&rev=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/common.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh Fri Oct 28 01:59:03 2005
@@ -1,18 +1,28 @@
#!/bin/sh
#
#!
-# @file /home/dlydick/harmony/bootjvm/bootJVM/common.sh
+# @file /home/dlydick/harmony/bootjvm/bootJVM/dist-common.sh
#
-# @brief Common code for @link ./build.sh build.sh@endlink and
-# @link ./clean.sh clean.sh@endlink and
+# @brief Common code for
# @link ./dist-src.sh dist-src.sh@endlink and
# @link ./dist-bin.sh dist-bin.sh@endlink and
# @link ./dist-doc.sh dist-doc.sh@endlink.
#
-# This script is common to @link ./build.sh build.sh@endlink and
-# @link ./clean.sh clean.sh@endlink and is not designed to do
+# This script is common to several scripts and is not designed to do
# anything on its own.
#
+# @note Originally, the build scripts @c @b build.sh and @c @b clean.sh
+# were used to build this project. This was a matter of
+# expediency, knowing full well that a need for @c @b Makefiles
+# would not be too far away. Both of those scripts also used
+# this common inclusion, but their functions, being superceded
+# by @c @b Makefiles , have been removed, leaving only the
+# distribution functions.
+#
+# @todo HARMONY-6-dist-common.sh-1 Combine all distribution functions
+# into a single @c @b dist.sh script and move this logic
+# into that script, eliminating this file.
+#
# All source code compiled according to selections from
# @link ./config.sh config.sh@endlink. This may or may not include
# any or all of:
@@ -27,6 +37,14 @@
# code from @b jvm/src (less
# @link jvm/src/main.c main.c@endlink) and
# archive it into @b libjvm/lib/libjvm.a </li>
+# (Note: Due to the fact that @b libjvm/src is a
+# symbolic link to @b jvm/src , this functionality
+# is @e only performed here by the Eclipse project
+# files. When using @c @b make for normal building,
+# @b jvm/src is the actual directory, but its
+# @link jvm/src/Makefile Makefile@endlink is set up
+# to compile both a library and a binary. See
+# @link ./Makefile ./Makefile@endlink for details.)
#
# <li>@b main: Sample @link main/src/main.c main()@endlink
# program. This program is currently not a unique
@@ -52,77 +70,42 @@
# <li>@b dox: Documentation of source code in @b jvm directory
# </ul>
#
-# Each of these directories contains a @b build.sh script. In addition
-# to these, an Eclipse project file is available in each for use with
-# the Eclipse C/C++ plugin, so this entire directory tree may be
-# imported wholesale into an Eclipse workspace and used without
+# Each of these directories contains a @c @b Makefile build script.
+# In addition to these, an Eclipse project file is available in each
+# for use with the Eclipse C/C++ plugin, so this entire directory tree
+# may be imported wholesale into an Eclipse workspace and used without
# changes. (Eclipse 3.0.2 generated these files.) Notice that
# the Eclipse setup does not build the documentation set. This must
-# be done manually with the top-level 'build.sh dox'.
-#
-# @attention For Eclipse uses, be aware that the configuration
-# options stored by @link config.sh config.sh@endlink into
-# <b><code>config/config_*.gcc*</code></b> are @e not directly
-# available to Eclipse and @e must be manually entered there
-# after they are established by @link ./config.sh config.sh@endlink.
-# They should be entered in the project build parameters for
-# C/C++ in the miscellaneous parameters section. For example,
-# @b -m32 and @b -m64 . For a command line GCC invocation,
-# the following is a convenient way to incorporate the options:
-#
-# @verbatim
-#
-# $ gcc `cat ../config/config_opts_always.gcc` \
-# `cat ../config/config_opts_usually.gcc` -c filename.c ...
+# be done manually with the top-level 'make dox'.
#
-# @endverbatim
+# @attention For Eclipse uses, be aware that the <b>\$(LFLAGS)</b>
+# compile options must be the same as found in
+# @link ./MakeRules ./MakeRules@endlink. These are unfortunately
+# @e not directly available to Eclipse and @e must be manually
+# verified there-- also check that the compiler <b>\$(CC)</b> and
+# archiver <b>\$(AR)</b> and linker <b>$(LN)</b> are correctly
+# specified in both placed. They should be entered in the project
+# build parameters for C/C++ in the miscellaneous parameters section.
+# For example,
+# @b -m32 and @b -m64 .
#
-# Notice that this script may be run instead of or as well as an
+# Notice that @c @b make may be run instead of or as well as an
# Eclipse build. There is only a slight difference as to
# where the compiled object files are stored, but the binaries
# and library archives are stored in the same place for both
-# methods.
-#
-#
-# @see @link ./build.sh ./build.sh@endlink
-#
-# @see @link ./clean.sh ./clean.sh@endlink
-#
-# @see @link jvm/build.sh jvm/build.sh@endlink
-#
-# @see @link libjvm/build.sh libjvm/build.sh@endlink
-#
-# @see @link main/build.sh main/build.sh@endlink
-#
-# @see @link test/build.sh test/build.sh@endlink
-#
-# @see @link jni/src/harmony/generic/0.0/build.sh
-# jni/src/harmony/generic/0.0/build.sh@endlink
-#
-# @see @link jvm/clean.sh jvm/clean.sh@endlink
-#
-# @see @link libjvm/clean.sh libjvm/clean.sh@endlink
+# methods. However, @e never use Eclipse for release and
+# distribution builds since @c @b make is the "official" release
+# method, as it were.
#
-# @see @link main/clean.sh main/clean.sh@endlink
#
-# @see @link test/clean.sh test/clean.sh@endlink
+# @see @link ./Makefile ./Makefile@endlink
#
-# @see @link jni/src/harmony/generic/0.0/clean.sh
-# jni/src/harmony/generic/0.0/clean.sh@endlink
+# @see @link ./MakeSetup ./MakeSetup@endlink
#
-# @see @link jvm/common.sh jvm/common.sh@endlink
+# @see @link ./MakeRules ./MakeRules@endlink
#
-# @see @link libjvm/common.sh libjvm/common.sh@endlink
#
-# @see @link main/common.sh main/common.sh@endlink
-#
-# @see @link test/common.sh test/common.sh@endlink
-#
-# @see @link jni/src/harmony/generic/0.0/common.sh
-# jni/src/harmony/generic/0.0/common.sh@endlink
-#
-#
-# @todo HARMONY-6-common.sh-1 A Windows .BAT version of this
+# @todo HARMONY-6-dist-common.sh-2 A Windows .BAT version of this
# script needs to be written
#
#
@@ -182,154 +165,6 @@
###################################################################
#
-# Check compilation options
-#
-Usage ()
-{
- (
- OPTLIST="{cfg | all | jvm | libjvm | main | test | jni | dox | help}"
- echo "Usage: $0 $OPTLIST"
- echo ""
-echo "where cfg Build what was configured by the 'config.sh' script"
- echo " all Build/clean everything"
- echo " jvm Build/clean main JVM development area"
- echo " libjvm Build/clean static JVM library"
- echo " main Build/clean JVM binary"
- echo " test Build/clean test classes for JVM development"
- echo " jni Build/clean JNI library and sample binary"
- echo " dox Build/clean documentation"
- echo " help Display this message"
- echo ""
- ) 1>&2
- exit 10
-}
-
-BUILD_ALL=0
-BUILD_JVM=0
-BUILD_LIB=0
-BUILD_MAIN=0
-BUILD_TEST=0
-BUILD_JNI=0
-BUILD_DOX=0
-
-BUILD_DIST=0
-
-case $1 in
- cfg) if test 1 -eq $CONFIG_BUILD_ALLCODE; then BUILD_ALL=1; fi
- if test 1 -eq $CONFIG_BUILD_JVM; then BUILD_JVM=1; fi
- if test 1 -eq $CONFIG_BUILD_LIB; then BUILD_LIB=1; fi
- if test 1 -eq $CONFIG_BUILD_MAIN; then BUILD_MAIN=1; fi
- if test 1 -eq $CONFIG_BUILD_TEST; then BUILD_TEST=1; fi
- if test 1 -eq $CONFIG_BUILD_JNI; then BUILD_JNI=1; fi
- if test 1 -eq $CONFIG_BUILD_DOX; then BUILD_DOX=1; fi
- ;;
- all) BUILD_ALL=1
- BUILD_JVM=1
- BUILD_LIB=1
- BUILD_MAIN=1
- BUILD_TEST=1
- BUILD_JNI=1
- BUILD_DOX=1
- ;;
- jvm) BUILD_JVM=1;;
- libjvm) BUILD_LIB=1;;
- main) BUILD_MAIN=1;;
- test) BUILD_TEST=1;;
- jni) BUILD_JNI=1;;
- dox) BUILD_DOX=1;;
-
- *) # These scripts ave their own Usage tests
- case $PGMNAME in
- dist-src.sh | dist-bin.sh | dist-doc.sh)
- # CONFIG_RELEASE_LEVEL contains release level,
- # and no other parameterization is needed
- BUILD_DIST=1
- ;;
- *) if test -z "$1"
- then
- $0 cfg
- exit $?
- fi
- Usage
- ;;
- esac
- ;;
-esac
-
-###################################################################
-#
-# Build binary from source code
-#
-rc=0
-
-# All scripts except distribution scripts use this logic:
-if test 0 -eq $BUILD_DIST
-then
- if test 1 -eq $BUILD_JVM
- then
- echo "$PGMNAME jvm"
- cd jvm
- $PGMNAME
- rc=$?
- cd ..
- fi
-
- if test 1 -eq $BUILD_LIB
- then
- echo "$PGMNAME libjvm"
- cd libjvm
- $PGMNAME
- rc1=$?
- if test 0 -eq $rc; then rc=$rc1; fi
- cd ..
- fi
-
- if test 1 -eq $BUILD_MAIN
- then
- echo "$PGMNAME main"
- cd main
- $PGMNAME
- rc1=$?
- if test 0 -eq $rc; then rc=$rc1; fi
- cd ..
- fi
-
- if test 1 -eq $BUILD_TEST
- then
- echo "$PGMNAME test"
- cd test
- $PGMNAME
- rc1=$?
- if test 0 -eq $rc; then rc=$rc1; fi
- cd ..
- fi
-
- if test 1 -eq $BUILD_JNI
- then
- echo "$PGMNAME jni/src/harmony/generic/0.0"
- cd jni/src/harmony/generic/0.0
- $PGMNAME
- rc1=$?
- if test 0 -eq $rc; then rc=$rc1; fi
- cd ../../../../..
- fi
-
- if test 1 -eq $BUILD_DOX
- then
- echo "$PGMNAME dox"
- case $PGMNAME in
- build.sh) dox.sh;;
- clean.sh) undox.sh;;
- esac
- rc1=$?
- if test 0 -eq $rc; then rc=$rc1; fi
- fi
-
- exit $rc
-fi
-
-###################################################################
-#
# Preparation for 'dist-src.sh' and 'dist-bin.sh' and 'dist-doc.sh'
#
# Strip out _all_ output, rebuild documentation in _all_ formats,
@@ -458,7 +293,7 @@
{
echo ""
echo \
-"$PGMNAME: Creating documentation in _all_ formats via 'build.sh $1'"
+"$PGMNAME: Creating documentation in _all_ formats via 'make $1'"
# Make SURE the output area is clean
SUPPRESS_DOXYGEN_VERYCLEAN=
export SUPPRESS_DOXYGEN_VERYCLEAN
@@ -467,10 +302,10 @@
CONFIG_BUILD_HTML_ADJUST_NETSCAPE47X=YES
export CONFIG_BUILD_HTML_ADJUST_NETSCAPE47X
- ./build.sh $1
+ make $1
# Set initial state to unpatched
- ./doxunpatch.sh
+ ./dox-unpatch.sh
}
DistDocTar ()
@@ -486,7 +321,7 @@
{
echo ""
echo "$PGMNAME: Removing temporary documentation set"
- ./clean.sh dox
+ make undox
rm -f $CDSD
mv ${CDSD}.ORIG $CDSD
}
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-doc.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-doc.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-doc.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-doc.sh Fri Oct 28 01:59:03 2005
@@ -6,10 +6,11 @@
# @brief Distribute Boot JVM documentation package.
#
# Make @e sure to have performed the final build by running
-# @link ./clean.sh clean.sh all@endlink followed by
-# @link ./build.sh build.sh all@endlink. This will guarantee
-# that everything compiles clean and may be installed and
-# run on all platforms of this CPU type.
+# @link ./Makefile make veryclean@endlink followed by
+# @link ./Makefile make all@endlink (both in the top level
+# directory). This will guarantee that everything compiles
+# clean and may be installed and run on all platforms of
+# this CPU type.
#
# Use @link ./dist-src.sh dist-src.sh@endlink to distribute
# the source package.
@@ -17,7 +18,7 @@
# Use @link ./dist-bin.sh dist-bin.sh@endlink to distribute
# the binary package.
#
-# @see @link ./common.sh ./common.sh@endlink
+# @see @link ./dist-common.sh ./dist-common.sh@endlink
#
# @attention Make @e sure that all Eclipse project files are in
# the "open" state when creating a distribution.
@@ -75,7 +76,7 @@
#
. echotest.sh
-. common.sh
+. dist-common.sh
MSG80="This script must NOT be interrupted. Last chance to stop it..."
$echon "$PGMNAME: $MSG80" $echoc
@@ -94,7 +95,7 @@
DistChkTarget
-./clean.sh all
+make veryclean
DistPrep
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-src.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-src.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-src.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-src.sh Fri Oct 28 01:59:03 2005
@@ -17,7 +17,7 @@
# the documentation package.
#
#
-# @see @link ./common.sh ./common.sh@endlink
+# @see @link ./dist-common.sh ./dist-common.sh@endlink
#
# @attention Make @e sure that all Eclipse project files are in
# the "open" state when creating a distribution.
@@ -74,7 +74,7 @@
#
. echotest.sh
-. common.sh
+. dist-common.sh
MSG80="This script must NOT be interrupted. Last chance to stop it..."
$echon "$PGMNAME: $MSG80" $echoc
@@ -91,8 +91,8 @@
#
# Notice that each JNI implmementation will have its own directory
# tree with its own scripts and its own 'bin' directory, while Eclipse
-# generates the directory in question, which 'clean.sh jni' does not
-# clean up.
+# generates the directory in question, which 'make -C jni/src clean'
+# does not clean up.
#
if test -d jni/bin
then
@@ -135,7 +135,7 @@
echo ""
echo "$PGMNAME: Cleaning out all binaries"
-./clean.sh all
+make veryclean
DistDocPrep
Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh (from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/commondox.sh)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/commondox.sh&r1=326513&r2=329162&rev=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/commondox.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh Fri Oct 28 01:59:03 2005
@@ -1,6 +1,6 @@
#!/bin/sh
#!
-# @file ./commondox.sh
+# @file ./dox-common.sh
#
# @brief Common code for @link ./dox.sh dox.sh@endlink and
# @link ./undox.sh undox.sh@endlink.
@@ -10,7 +10,7 @@
# anything on its own.
#
#
-# @todo HARMONY-6-commondox.sh-1 A Windows .BAT version of this
+# @todo HARMONY-6-dox-common.sh-1 A Windows .BAT version of this
# script needs to be written
#
#
Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh (from r326458, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox_filter.sh)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox_filter.sh&r1=326458&r2=329162&rev=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox_filter.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh Fri Oct 28 01:59:03 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
#!
-# @file ./dox_filter.sh
+# @file ./dox-filter.sh
#
# @brief Convince Doxygen to parse files other than source code
# as part of documentation set.
@@ -27,7 +27,7 @@
# please refer to @link ./LICENSE LICENSE@endlink.
#
#
-# @todo HARMONY-6-dox_filter.sh-1 A Windows .BAT version of this
+# @todo HARMONY-6-dox-filter.sh-1 A Windows .BAT version of this
# script needs to be written
#
#
@@ -65,7 +65,7 @@
# @section Reference
#
#/ /*
-# (Use #! and #/ with dox_filter.sh to fool Doxygen into
+# (Use #! and #/ with dox-filter.sh to fool Doxygen into
# parsing this non-source text file for the documentation set.
# Use the above open comment to force termination of parsing
# since it is not a Doxygen-style 'C' comment.)
@@ -99,12 +99,15 @@
else
case $FILENAME in
AUTHORS | INSTALL | LICENSE | README) convertit=2;;
+ RELEASE_LEVEL) convertit=3;;
+ Makefile | MakeSetup | MakeRules) convertit=4;;
*);;
esac
fi
case $convertit in
- 0) cat $1;;
+ 0 | 3)
+ cat $1;;
1) # Read file, strip /bin/sh line, convert comments
cat $1 | \
@@ -113,7 +116,8 @@
sed 's,^#!,/*!,;s,^#/, */,;s,^#, *,'
;;
- 2) # Read file, convert whole file of which only
+ 2 | 4)
+ # Read file, convert whole file of which only
# header areas need to contain comments.
cat $1 | \
sed 's,^#!,/*!,;s,^#/, */,;s,^#, *,'
Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh (from r326459, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxpatch.sh)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxpatch.sh&r1=326459&r2=329162&rev=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxpatch.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh Fri Oct 28 01:59:03 2005
@@ -1,6 +1,6 @@
#!/bin/sh
#!
-# @file ./doxpatch.sh
+# @file ./dox-patch.sh
#
# @brief Install CSS patch in HTML documentation that supports
# NetScape 4.7x HTML browser.
@@ -20,16 +20,16 @@
# When configured, the cascading style sheet @c @b doc/html/doxygen.css
# has two copies made when @link ./dox.sh dox.sh@endlink is run.
# A symbolic link by the original name points to the patched copy
-# originally. @link ./doxunpatch.sh doxunpatch@endlink can use it
+# originally. @link ./dox-unpatch.sh dox-unpatch@endlink can use it
# to revert back to the unpatched copy. This script moves the symbolic
# link to the patched copy that suppresses processing that causes
# the problem. The down side of this approach is that other formatting
# may not be quite right, but at least the blocks in question are
# readable.
#
-# @see doxunpatch.sh
+# @see dox-unpatch.sh
#
-# @todo HARMONY-6-doxpatch.sh-1 A Windows .BAT version of this
+# @todo HARMONY-6-dox-patch.sh-1 A Windows .BAT version of this
# script needs to be written
#
#
@@ -77,7 +77,7 @@
#
# Script setup
#
-. commondox.sh
+. dox-common.sh
. config/config_build_steps.sh
########################################################################
Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh (from r326459, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxunpatch.sh)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxunpatch.sh&r1=326459&r2=329162&rev=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/doxunpatch.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh Fri Oct 28 01:59:03 2005
@@ -1,6 +1,6 @@
#!/bin/sh
#!
-# @file ./doxunpatch.sh
+# @file ./dox-unpatch.sh
#
# @brief Remove CSS patch in HTML documentation that supports
# NetScape 4.7x HTML browser.
@@ -21,15 +21,15 @@
# has two copies made when @link ./dox.sh dox.sh@endlink is run.
# A symbolic link by the original name points to the patched copy
# originally, which this script can use to revert back to the unpatched
-# copy. @link ./doxpatch.sh doxpatch@endlink can move the symbolic
+# copy. @link ./dox-patch.sh dox-patch@endlink can move the symbolic
# link to the patched copy that suppresses processing that causes
# the problem. The down side of this approach is that other formatting
# may not be quite right, but at least the blocks in question are
# readable.
#
-# @see doxunpatch.sh
+# @see dox-patch.sh
#
-# @todo HARMONY-6-doxunpatch.sh-1 A Windows .BAT version of this
+# @todo HARMONY-6-dox-unpatch.sh-1 A Windows .BAT version of this
# script needs to be written
#
#
@@ -77,7 +77,7 @@
#
# Script setup
#
-. commondox.sh
+. dox-common.sh
. config/config_build_steps.sh
########################################################################
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh Fri Oct 28 01:59:03 2005
@@ -27,8 +27,8 @@
# solved by adjusting the <b>doxygen.css</b> (the default
# @b .css file) or supplying one that is customized for
# the project or perhaps just for old NetScape browsers.
-# The scripts @link ./doxpatch.sh doxpatch.sh@endlink and
-# @link ./doxunpatch.sh doxunpatch.sh@endlink that support
+# The scripts @link ./dox-patch.sh dox-patch.sh@endlink and
+# @link ./dox-unpatch.sh dox-unpatch.sh@endlink that support
# the interim solution might also be used in support of the
# proper solution if an "original" and a "patched" version of
# the style sheet exists in the HTML output directory.
@@ -105,7 +105,7 @@
#
# Script setup
#
-. commondox.sh
+. dox-common.sh
. config/config_build_steps.sh
########################################################################
@@ -186,7 +186,7 @@
########################################################################
#
# Warnings about preprocessor symbols that are present only when
-# 'config/config.h' or 'jvm/src/arch.h' generate them.
+# 'config/config.h' or 'jvm/include/arch.h' generate them.
#
ODD1="$DOC4UNKNOWN ARCH_ODD2_ADDRESS_SIGSEGV"
ODD2="${UNABLE2RESOLVE}#ARCH_ODD2_ADDRESS_SIGSEGV"
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndata.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndata.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndata.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndata.sh Fri Oct 28 01:59:03 2005
@@ -74,6 +74,17 @@
#
########################################################################
#
+# Script setup
+#
+# `dirname $0` for shells without that utility
+PGMDIR=`expr "${0:-.}/" : '\(/\)/*[^/]*//*$' \| \
+ "${0:-.}/" : '\(.*[^/]\)//*[^/][^/]*//*$' \| .`
+PGMDIR=`cd $PGMDIR; pwd`
+
+. $PGMDIR/config/config_build_steps.sh
+
+########################################################################
+#
# Check script syntax
#
if test 0 -eq $#
@@ -89,7 +100,10 @@
DOLLAR='$'
SEARCHFOR="^\\\$URL: |^\\\$HeadURL: "
-strings $* | egrep "$SEARCHFOR" | sort -u | cut -f2,6 -d' '
+strings $* | sed "s,$CONFIG_REPOSITORY,," | \
+ egrep "$SEARCHFOR" | \
+ sort -u | \
+ cut -f2,6 -d' '
########################################################################
#
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndups.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndups.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndups.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/getsvndups.sh Fri Oct 28 01:59:03 2005
@@ -72,6 +72,17 @@
#
########################################################################
#
+# Script setup
+#
+# `dirname $0` for shells without that utility
+PGMDIR=`expr "${0:-.}/" : '\(/\)/*[^/]*//*$' \| \
+ "${0:-.}/" : '\(.*[^/]\)//*[^/][^/]*//*$' \| .`
+PGMDIR=`cd $PGMDIR; pwd`
+
+. $PGMDIR/config/config_build_steps.sh
+
+########################################################################
+#
# Check script syntax
#
if test 0 -eq $#
@@ -93,7 +104,10 @@
TMPFILE2=${TMPDIR:-/tmp}/tmp.2.$$
rm -f $TMPFILE1 $TMPFILE2
-strings $* | egrep "$SEARCHFOR" | sort -u | cut -f2,6 -d' ' > $TMPFILE1
+strings $* | sed "s,$CONFIG_REPOSITORY,," | \
+ egrep "$SEARCHFOR" | \
+ sort -u | \
+ cut -f2,6 -d' ' > $TMPFILE1
cut -f1 -d' ' $TMPFILE1 > $TMPFILE2
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh?rev=329162&r1=329161&r2=329162&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh Fri Oct 28 01:59:03 2005
@@ -55,7 +55,7 @@
#
# Script setup
#
-. commondox.sh
+. dox-common.sh
########################################################################
#