Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 72774 invoked from network); 4 Nov 2005 20:18:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Nov 2005 20:18:13 -0000 Received: (qmail 80177 invoked by uid 500); 4 Nov 2005 20:18:08 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 80144 invoked by uid 500); 4 Nov 2005 20:18:08 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 80133 invoked by uid 99); 4 Nov 2005 20:18:08 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 04 Nov 2005 12:18:05 -0800 Received: (qmail 71827 invoked by uid 65534); 4 Nov 2005 20:17:45 -0000 Message-ID: <20051104201745.71826.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r330881 - in /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM: ./ support/ Date: Fri, 04 Nov 2005 20:17:41 -0000 To: harmony-commits@incubator.apache.org From: dlydick@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dlydick Date: Fri Nov 4 12:16:42 2005 New Revision: 330881 URL: http://svn.apache.org/viewcvs?rev=330881&view=rev Log: Moved support utilities to 'support' subdirectory. Added: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules - copied, changed from r329296, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeRules incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeSetup - copied, changed from r329163, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeSetup incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/bootjvm.dox - copied, changed from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dist-common.sh - copied, changed from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-common.sh - copied, changed from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-filter.sh - copied, changed from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/echotest.sh - copied, changed from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/echotest.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/svnstat.sh - copied, changed from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/svnstat.sh Removed: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeRules incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeSetup incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/echotest.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/svnstat.sh Modified: 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/dox-patch.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh 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=330881&r1=330880&r2=330881&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 Nov 4 12:16:42 2005 @@ -17,7 +17,7 @@ # Use @link ./dist-doc.sh dist-doc.sh@endlink to distribute # the documentation package. # -# @see @link ./dist-common.sh ./dist-common.sh@endlink +# @see @link ./support/dist-common.sh support/dist-common.sh@endlink # # @attention Make @e sure that all Eclipse project files are in # the "open" state when creating a distribution. @@ -28,7 +28,7 @@ # 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 ./MakeRules ./MakeRules@endlink, as well as +# @link support/MakeRules support/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 @@ -124,9 +124,9 @@ # # Script setup. # -. echotest.sh +. support/echotest.sh -. dist-common.sh +. support/dist-common.sh MSG80="This script must NOT be interrupted. Last chance to stop it..." $echon "$PGMNAME: $MSG80" $echoc 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=330881&r1=330880&r2=330881&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 Nov 4 12:16:42 2005 @@ -18,7 +18,7 @@ # Use @link ./dist-bin.sh dist-bin.sh@endlink to distribute # the binary package. # -# @see @link ./dist-common.sh ./dist-common.sh@endlink +# @see @link support/dist-common.sh support/dist-common.sh@endlink # # @attention Make @e sure that all Eclipse project files are in # the "open" state when creating a distribution. @@ -74,9 +74,9 @@ # # Script setup. # -. echotest.sh +. support/echotest.sh -. dist-common.sh +. support/dist-common.sh MSG80="This script must NOT be interrupted. Last chance to stop it..." $echon "$PGMNAME: $MSG80" $echoc Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh?rev=330881&r1=330880&r2=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-patch.sh Fri Nov 4 12:16:42 2005 @@ -77,7 +77,7 @@ # # Script setup # -. dox-common.sh +. support/dox-common.sh . config/config_build_steps.sh ######################################################################## Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh?rev=330881&r1=330880&r2=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-unpatch.sh Fri Nov 4 12:16:42 2005 @@ -77,7 +77,7 @@ # # Script setup # -. dox-common.sh +. support/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=330881&r1=330880&r2=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox.sh Fri Nov 4 12:16:42 2005 @@ -105,7 +105,7 @@ # # Script setup # -. dox-common.sh +. support/dox-common.sh . config/config_build_steps.sh ######################################################################## @@ -321,7 +321,7 @@ if test "YES" != "$CONFIG_BUILD_HTML_ADJUST_NETSCAPE47X" then - doxygen bootjvm.dox 2>&1 | egrep -v "${DOXYGEN_FILTER}" + doxygen support/bootjvm.dox 2>&1 | egrep -v "${DOXYGEN_FILTER}" else # Only meaningful if "GENERATE_HTML=YES" in directive file @@ -332,7 +332,7 @@ rm -f $CSS_FILE - doxygen bootjvm.dox 2>&1 | egrep -v "${DOXYGEN_FILTER}" + doxygen support/bootjvm.dox 2>&1 | egrep -v "${DOXYGEN_FILTER}" mv $CSS_FILE $CSS_FILE_ORIG Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules (from r329296, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeRules) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeRules&r1=329296&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeRules (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules Fri Nov 4 12:16:42 2005 @@ -1,12 +1,12 @@ # #! -# @file ./MakeRules +# @file support/MakeRules # # @brief Rules for building targets # # @see @link ./Makefile ./Makefile@endlink # -# @see @link ./MakeSetup ./MakeSetup@endlink +# @see @link support/MakeSetup support/MakeSetup@endlink # # # @section Control @@ -160,9 +160,25 @@ ######################## # -# Create header file dependency list +# Start 'C' utility rules with empty rule. +# Do nothing for these rules unless 'C' sources are defined. +# If defined, additional actions are also defined. # -DEPEND=.depend +depend:: +nodepend:: +tags:: + +######################## +# +# Create header file dependency list. +# Notice that the $(DEPEND_FILE) file cannot +# reside in $(BINDIR) or $(LIBDIR) since +# some directories have targets in both, +# thus making this file's proper location +# ambiguous. Therefore, leave it in the +# _same_ directory as its invoking Makefile. +# +DEPEND_FILE=.depend ifneq (,$(BIN_TARGET)) DEPDIR=$(BINDIR) endif @@ -170,37 +186,72 @@ DEPDIR=$(LIBDIR) endif -TOUCHDEPEND=touch $(DEPEND) -MAKEDEPEND:=makedepend -f$(DEPEND) $(INCLUDES) -p$(DEPDIR)/ \ - $(C_SOURCES) $(C_HEADERS) +TOUCHDEPEND=touch $(DEPEND_FILE) +MAKEDEPEND:=makedepend -f$(DEPEND_FILE) $(INCLUDES) -p$(DEPDIR)/ \ + $(C_SOURCES) + +######################## +# +# Build 'C' source and header file tags for 'vi'. +# Other editor utilties are welcome here, but +# please _add_ to this function, do not replace it. +# +# Note: 'tags' is the default tag file name for 'ctags' +# +CTAGS=ctags +CTAGS_FILE=tags + +######################## +# +# Start of additional definitions when 'C' sources are defined +# There will be a corresponding end of block later. +# +ifneq (,$(C_SOURCES)) ######################## # # Unconditionally build dependencies for directories with 'C' sources. # Ignore request for other directory types. # + depend:: -ifneq (,$(C_SOURCES)) $(CC_SILENT)$(TOUCHDEPEND) $(CC_SILENT)-$(MAKEDEPEND) --include $(DEPEND) +nodepend:: + $(CC_SILENT)rm -f $(DEPEND_FILE) + +-include $(DEPEND_FILE) + +######################## +# +# Unconditionally build editor tag file $(CTAGS_FILE). +# +tags:: + $(CC_SILENT)-$(CTAGS) -f $(CTAGS_FILE) $(C_SOURCES) $(C_HEADERS) ######################## # # Automatically build dependencies if not present # all:: -ifeq (,$(wildcard $(DEPEND))) +ifeq (,$(wildcard $(DEPEND_FILE))) $(CC_SILENT)@$(TOUCHDEPEND) $(CC_SILENT)@-$(MAKEDEPEND) endif # DEPEND + +######################## +# +# End of additional definitions when 'C' sources are defined. +# endif # C_SOURCES clean veryclean:: - $(CLEAN_SILENT)rm -f $(DEPEND) $(DEPEND).bak + $(CLEAN_SILENT)rm -f core \ + $(DEPEND_FILE) $(DEPEND_FILE).bak core \ + $(CTAGS_FILE) ################################################################### # @@ -232,16 +283,16 @@ # are up to date or not. # $(JAR_TARGET):: $(JAVA_SOURCES) -ifeq (,$(wildcard $(LIBDIR))) +#ifeq (,$(wildcard $(LIBDIR))) @if test ! -d $(LIBDIR); then mkdir $(LIBDIR); fi -endif -ifeq (,$(wildcard $(CLSDIR))) +#endif +#ifeq (,$(wildcard $(CLSDIR))) @if test ! -d $(CLSDIR); then mkdir $(CLSDIR); fi -endif -ifeq (,$(wildcard $(BINDIR))) - @if test ! -d $(BINDIR); then mkdir $(BINDIR); fi -endif +#endif $(JAVAC_SILENT)$(JAVAC) $(JFLAGS) $(JJFLAGS) $^ +#ifeq (,$(wildcard $(BINDIR))) + @if test ! -d $(BINDIR); then mkdir $(BINDIR); fi +#endif $(JAVAC_SILENT)$(JAR) $(JARCMD) $@ -C $(CLSDIR) . # Assume that 'rmdir' works on an empty directory-- there should @@ -283,10 +334,10 @@ # # Compile sources into linkable objects # -$(BINDIR)/%.$(C_OBJECT): %.$(C_SOURCE) -ifeq (,$(wildcard $(BINDIR))) +$(BINDIR)/%.$(C_OBJECT):: %.$(C_SOURCE) +#ifeq (,$(wildcard $(BINDIR))) @if test ! -d $(BINDIR); then mkdir $(BINDIR); fi -endif +#endif $(CC_SILENT)$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $< # @@ -304,7 +355,7 @@ $(CLEAN_SILENT)rm -f $(BINDIR)/main.$(C_OBJECT) endif $(CLEAN_SILENT)rm -f $(BIN_OBJECTS) $(BIN_TARGET) - @rm -rf $(BINDIR)/src + @rm -rf $(ECLIPSE_BINDIR) $(CLEAN_SILENT)-rmdir $(BINDIR) veryclean:: @@ -325,9 +376,9 @@ # Compile sources into archivable objects # $(LIBDIR)/%.$(C_OBJECT): %.$(C_SOURCE) -ifeq (,$(wildcard $(LIBDIR))) +#ifeq (,$(wildcard $(LIBDIR))) @if test ! -d $(LIBDIR); then mkdir $(LIBDIR); fi -endif +#endif $(CC_SILENT)$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $< # @@ -340,7 +391,7 @@ # _never_ be anything there that 'make' did not put there. clean:: $(CLEAN_SILENT)rm -f $(LIB_OBJECTS) $(LIB_TARGET) - @rm -rf $(LIBDIR)/src + @rm -rf $(ECLIPSE_LIBDIR) $(CLEAN_SILENT)-rmdir $(LIBDIR) veryclean:: @@ -354,7 +405,7 @@ # Rules that really only operate at the top level, # placed at other levels for convenience. # -roster dox undox:: +roster doc dox undox:: $(MAKE) -C $(TOPDIR) $@ ################################################################### Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeSetup (from r329163, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeSetup) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeSetup?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeSetup&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeSetup&r1=329163&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/MakeSetup (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeSetup Fri Nov 4 12:16:42 2005 @@ -1,12 +1,12 @@ # #! -# @file ./MakeSetup +# @file support/MakeSetup # # @brief Setup and configuration of all Makefiles # # @see @link ./Makefile ./Makefile@endlink # -# @see @link ./MakeRules ./MakeRules@endlink +# @see @link support/MakeRules support/MakeRules@endlink # # # @section Control @@ -62,21 +62,16 @@ ######################## # -# Base name of this directory and of parent directory +# Base name of this directory # -DIRNAME:=$(shell expr $(PWD) : '\(.*[^/]\)/*$' : '.*/\(..*\)') -PROJECTNAME:= - -ifeq ("src","$(DIRNAME)") -PROJECTNAME:=$(shell expr $(PWD)/ : '\(/\)/*[^/]*//*$' \| $(PWD)/ \ - : '\(.*[^/]\)//*[^/][^/]*//*$' ) -endif +DIRNAME:=$(shell expr $(PWD) : '\(.*[^/]\)/*$$' : '.*/\(..*\)') ######################## # # Names of source and target directories # CFGDIR=$(TOPDIR)/config +DOCDIR=$(TOPDIR)/doc INCDIR=../include BINDIR=../bin @@ -84,6 +79,14 @@ CLSDIR=$(LIBDIR)/classes LIBJVM_LIBDIR=../../libjvm/lib + +######################## +# +# Support Eclipse version of target directories in 'clean' rules +# +ECLIPSE_BINDIR=$(BINDIR)/src +ECLIPSE_LIBDIR=$(LIBDIR)/src +ECLIPSE_LIBJVM_LIBDIR=$(LIBJVM_LIBDIR)/src ######################## # Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/bootjvm.dox (from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/bootjvm.dox?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/bootjvm.dox&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox&r1=329162&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/bootjvm.dox (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/bootjvm.dox Fri Nov 4 12:16:42 2005 @@ -1,6 +1,6 @@ ######################################################################## # -# bootjvm.dox +# support/bootjvm.dox # # Doxygen setup and controls for Apache Harmony 'bootJVM' project. # @@ -138,12 +138,13 @@ @INCLUDE = config/config_roster_jni_h.dox @INCLUDE = config/config_roster_jni_java.dox @INCLUDE = config/config_roster_test_java.dox +@INCLUDE = config/config_roster_org_java.dox @INCLUDE = config/config_roster_sh.dox ################################# # FILE_PATTERNS = # Explicitly specify files with INPUT= -# FILE_VERSION_FILTER = svnstat.sh # Per doc recommendation +# FILE_VERSION_FILTER = support/svnstat.sh # Per doc recommendation RECURSIVE = NO ################################# EXCLUDE = @@ -161,7 +162,7 @@ # with such work, re-enable this # parameter and rebuild all docs. # -INPUT_FILTER = dox-filter.sh +INPUT_FILTER = support/dox-filter.sh # FILTER_PATTERNS = FILTER_SOURCE_FILES = YES Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dist-common.sh (from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dist-common.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dist-common.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh&r1=329162&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dist-common.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dist-common.sh Fri Nov 4 12:16:42 2005 @@ -1,7 +1,7 @@ #!/bin/sh # #! -# @file /home/dlydick/harmony/bootjvm/bootJVM/dist-common.sh +# @file support/dist-common.sh # # @brief Common code for # @link ./dist-src.sh dist-src.sh@endlink and @@ -19,9 +19,9 @@ # 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. +# @todo HARMONY-6-support-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 @@ -80,10 +80,10 @@ # # @attention For Eclipse uses, be aware that the \$(LFLAGS) # 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 \$(CC) and -# archiver \$(AR) and linker $(LN) are correctly +# @link support/MakeRules support/MakeRules@endlink. These are +# unfortunately @e not directly available to Eclipse and @e must be +# manually verified there-- also check that the compiler \$(CC) +# and archiver \$(AR) and linker $(LN) 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, @@ -100,13 +100,13 @@ # # @see @link ./Makefile ./Makefile@endlink # -# @see @link ./MakeSetup ./MakeSetup@endlink +# @see @link support/MakeSetup support/MakeSetup@endlink # -# @see @link ./MakeRules ./MakeRules@endlink +# @see @link support/MakeRules support/MakeRules@endlink # # -# @todo HARMONY-6-dist-common.sh-2 A Windows .BAT version of this -# script needs to be written +# @todo HARMONY-6-support-dist-common.sh-2 A Windows .BAT version +# of this script needs to be written # # # @section Control Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-common.sh (from r329162, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-common.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-common.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh&r1=329162&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-common.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-common.sh Fri Nov 4 12:16:42 2005 @@ -1,6 +1,6 @@ #!/bin/sh #! -# @file ./dox-common.sh +# @file support/dox-common.sh # # @brief Common code for @link ./dox.sh dox.sh@endlink and # @link ./undox.sh undox.sh@endlink. @@ -10,8 +10,8 @@ # anything on its own. # # -# @todo HARMONY-6-dox-common.sh-1 A Windows .BAT version of this -# script needs to be written +# @todo HARMONY-6-support-dox-common.sh-1 A Windows .BAT version of +# this script needs to be written # # # @section Control @@ -58,7 +58,7 @@ # # Doxygen configuration file. Parse out keywords from this file. # -DOXYFILE=bootjvm.dox +DOXYFILE=support/bootjvm.dox ######################################################################## # Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-filter.sh (from r329162, 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/support/dox-filter.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-filter.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh&r1=329162&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/dox-filter.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/dox-filter.sh Fri Nov 4 12:16:42 2005 @@ -1,13 +1,13 @@ #!/bin/sh # #! -# @file ./dox-filter.sh +# @file support/dox-filter.sh # # @brief Convince Doxygen to parse files other than source code # as part of documentation set. # -# This script is invoked from with @b doxygen via @b bootjvm.dox as -# the @b INPUT_FILTER value. +# This script is invoked from with @b doxygen via @b support/bootjvm.dox +# as the @b INPUT_FILTER value. # # For shell scripts, strip non-comments and convert shell comments # beginning in column 1 from (^#) to ( *). These appear @@ -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-support-dox-filter.sh-1 A Windows .BAT version of this # script needs to be written # # @@ -106,7 +106,7 @@ fi case $convertit in - 0 | 3) + 0) cat $1;; 1) # Read file, strip /bin/sh line, convert comments @@ -116,7 +116,7 @@ sed 's,^#!,/*!,;s,^#/, */,;s,^#, *,' ;; - 2 | 4) + 2 | 3 | 4) # Read file, convert whole file of which only # header areas need to contain comments. cat $1 | \ Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/echotest.sh (from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/echotest.sh) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/echotest.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/echotest.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/echotest.sh&r1=326513&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/echotest.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/echotest.sh Fri Nov 4 12:16:42 2005 @@ -1,7 +1,7 @@ #!/bin/sh # #! -# @file ./echotest.sh +# @file support/echotest.sh # # @brief Generic replacement for echo -n # @@ -13,7 +13,7 @@ # It should work on any flavor of BASH, Korn, and Bourne shells. # A stand-alone invocation does nothing, but is benign. # -# Loaded where needed as: . ./echotest.sh +# Loaded where needed as: . support/echotest.sh # # Invoke as: #$echon "Print a line without a final newline$echoc" Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/svnstat.sh (from r326513, incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/svnstat.sh) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/svnstat.sh?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/svnstat.sh&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/svnstat.sh&r1=326513&r2=330881&rev=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/svnstat.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/svnstat.sh Fri Nov 4 12:16:42 2005 @@ -1,13 +1,14 @@ #!/bin/sh # #! -# @file ./svnstat.sh +# @file support/svnstat.sh # # @brief Per doxygen @b config.html recommendation for # FILE_VERSION_FILTER # -# @todo HARMONY-6-svnstat.sh-1 The @c @b sed(1) command as documented -# is not valid. See also @@bug entry HARMONY-6-svnstat.sh-1001. +# @todo HARMONY-6-support-svnstat.sh-1 The @c @b sed(1) command as +# documented is not valid. See also @@bug entry +# HARMONY-6-support-svnstat.sh-1001. # # @verbatim # @@ -50,10 +51,10 @@ # # @section Reference # -# @bug HARMONY-6-svnstat.sh-1001 The @c @b sed(1) string recommended in -# the Doxygen narrative needs fixing. It is reported here -# verbatim, but it is possible that the number of backslash -# characters is not correct. +# @bug HARMONY-6-support-svnstat.sh-1001 The @c @b sed(1) string +# recommended in the Doxygen narrative needs fixing. It is +# reported here verbatim, but it is possible that the number +# of backslash characters is not correct. # #/ /* # (Use #! and #/ with dox_filter.sh to fool Doxygen into 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=330881&r1=330880&r2=330881&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/undox.sh Fri Nov 4 12:16:42 2005 @@ -55,7 +55,7 @@ # # Script setup # -. dox-common.sh +. support/dox-common.sh ######################################################################## #