1.1 --- a/make/sun/rmi/corbalogsources/Makefile Mon Mar 09 23:36:43 2009 -0700
1.2 +++ b/make/sun/rmi/corbalogsources/Makefile Mon Mar 23 17:43:15 2009 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
1.6 +# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -75,15 +75,14 @@
1.11 POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
1.12 UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
1.13
1.14 -MC_GENERATE_CLASS = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class
1.15 -MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource
1.16 +MC_GENERATE_CLASS = make-class
1.17 +MC_GENERATE_LOG_RB = make-resource
1.18
1.19 -JSCHEME_LIB_DIRECTORY=$(SRC_DIR)/com/sun/tools/corba/se/logutil/lib
1.20 -JSCHEME_CLASSPATH=$(JSCHEME_LIB_DIRECTORY)/jscheme.jar$(CLASSPATH_SEPARATOR)$(JSCHEME_LIB_DIRECTORY)/jschemelogutil.jar
1.21 -JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) \
1.22 - -cp "$(JSCHEME_CLASSPATH)" jscheme.REPL $(MC_GENERATE_CLASS)
1.23 -JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \
1.24 - -cp "$(JSCHEME_CLASSPATH)" jscheme.REPL $(MC_GENERATE_LOG_RB)
1.25 +MC_CLASSPATH=$(BUILDTOOLJARDIR)/MC.jar
1.26 +MCJ_GENERATE_CLASS = $(BOOT_JAVA_CMD) \
1.27 + -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS)
1.28 +MCJ_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \
1.29 + -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
1.30
1.31
1.32 #
1.33 @@ -104,28 +103,28 @@
1.34 $(MKDIR) -p $(LOG_GENDIRECTORY)
1.35
1.36 $(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
1.37 - $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
1.38 + $(MCJ_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
1.39
1.40 $(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
1.41 - $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
1.42 + $(MCJ_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
1.43
1.44 $(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
1.45 - $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
1.46 + $(MCJ_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
1.47
1.48 $(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
1.49 - $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
1.50 + $(MCJ_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
1.51
1.52 $(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
1.53 - $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
1.54 + $(MCJ_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
1.55
1.56 $(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
1.57 - $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
1.58 + $(MCJ_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
1.59
1.60 $(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
1.61 - $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
1.62 + $(MCJ_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
1.63
1.64 $(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
1.65 - $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
1.66 + $(MCJ_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
1.67
1.68 logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
1.69
1.70 @@ -142,28 +141,28 @@
1.71 $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
1.72
1.73 $(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
1.74 - $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
1.75 + $(MCJ_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
1.76
1.77 $(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
1.78 - $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
1.79 + $(MCJ_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
1.80
1.81 $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
1.82 - $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
1.83 + $(MCJ_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
1.84
1.85 $(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
1.86 - $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
1.87 + $(MCJ_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
1.88
1.89 $(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
1.90 - $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
1.91 + $(MCJ_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
1.92
1.93 $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
1.94 - $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
1.95 + $(MCJ_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
1.96
1.97 $(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
1.98 - $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
1.99 + $(MCJ_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
1.100
1.101 $(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
1.102 - $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
1.103 + $(MCJ_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
1.104
1.105
1.106 #
