1.1 --- a/common/makefiles/RMICompilation.gmk Wed Oct 16 13:50:05 2013 +0200
1.2 +++ b/common/makefiles/RMICompilation.gmk Thu Oct 17 13:53:08 2013 -0700
1.3 @@ -24,69 +24,69 @@
1.4 #
1.5
1.6 define SetupRMICompilation
1.7 - # param 1 is a name for a variable to depend on.
1.8 - # param 2 and up are named args.
1.9 - # CLASSES:=List of classes to generate stubs for
1.10 - # CLASSES_DIR:=Directory where to look for classes
1.11 - # STUB_CLASSES_DIR:=Directory in where to put stub classes
1.12 - # RUN_V11:=Set to run rmic with -v1.1
1.13 - # RUN_V12:=Set to run rmic with -v1.2
1.14 - # RUN_IIOP:=Set to run rmic with -iiop
1.15 - # RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
1.16 - # KEEP_GENERATED:=Set to keep generated sources around
1.17 - $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
1.18 - $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
1.19 - $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
1.20 + # param 1 is a name for a variable to depend on.
1.21 + # param 2 and up are named args.
1.22 + # CLASSES:=List of classes to generate stubs for
1.23 + # CLASSES_DIR:=Directory where to look for classes
1.24 + # STUB_CLASSES_DIR:=Directory in where to put stub classes
1.25 + # RUN_V11:=Set to run rmic with -v1.1
1.26 + # RUN_V12:=Set to run rmic with -v1.2
1.27 + # RUN_IIOP:=Set to run rmic with -iiop
1.28 + # RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
1.29 + # KEEP_GENERATED:=Set to keep generated sources around
1.30 + $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
1.31 + $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
1.32 + $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
1.33
1.34 $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
1.35
1.36 - $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
1.37 - $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
1.38 - $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
1.39 - $1_TARGETS := $$($1_STUB_FILES)
1.40 - $1_ARGS :=
1.41 - ifneq (,$$($1_RUN_V11))
1.42 - $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
1.43 - $1_TARGETS += $$($1_SKEL_FILES)
1.44 - $1_ARGS += -v1.1
1.45 - endif
1.46 - ifneq (,$$($1_RUN_V12))
1.47 - $1_ARGS += -v1.2
1.48 - endif
1.49 + $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
1.50 + $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
1.51 + $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
1.52 + $1_TARGETS := $$($1_STUB_FILES)
1.53 + $1_ARGS :=
1.54 + ifneq (,$$($1_RUN_V11))
1.55 + $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
1.56 + $1_TARGETS += $$($1_SKEL_FILES)
1.57 + $1_ARGS += -v1.1
1.58 + endif
1.59 + ifneq (,$$($1_RUN_V12))
1.60 + $1_ARGS += -v1.2
1.61 + endif
1.62
1.63 - $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
1.64 - $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
1.65 - $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
1.66 + $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
1.67 + $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
1.68 + $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
1.69
1.70 - ifneq (,$$($1_RUN_IIOP))
1.71 - $1_TARGETS += $$($1_TIE_FILES)
1.72 - $1_ARGS += -iiop -emitPermissionCheck
1.73 - endif
1.74 - ifneq (,$$($1_RUN_IIOP_STDPKG))
1.75 - $1_TARGETS += $$($1_TIE_STDPKG_FILES)
1.76 - $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
1.77 - endif
1.78 + ifneq (,$$($1_RUN_IIOP))
1.79 + $1_TARGETS += $$($1_TIE_FILES)
1.80 + $1_ARGS += -iiop -emitPermissionCheck
1.81 + endif
1.82 + ifneq (,$$($1_RUN_IIOP_STDPKG))
1.83 + $1_TARGETS += $$($1_TIE_STDPKG_FILES)
1.84 + $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
1.85 + endif
1.86
1.87 - ifneq (,$$($1_KEEP_GENERATED))
1.88 - $1_ARGS += -keepgenerated
1.89 - $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
1.90 - endif
1.91 + ifneq (,$$($1_KEEP_GENERATED))
1.92 + $1_ARGS += -keepgenerated
1.93 + $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
1.94 + endif
1.95
1.96 - $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
1.97 + $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
1.98
1.99 - $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
1.100 + $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
1.101
1.102 - $$($1_DEP_FILE): $$($1_CLASS_FILES)
1.103 + $$($1_DEP_FILE): $$($1_CLASS_FILES)
1.104 $(MKDIR) -p $$($1_STUB_CLASSES_DIR)
1.105 if [ "x$$($1_ARGS)" != "x" ]; then \
1.106 - $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.107 - $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
1.108 - -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
1.109 + $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
1.110 + $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
1.111 + -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
1.112 fi;
1.113 if [ "x$$($1_ARGS2)" != "x" ]; then \
1.114 - $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) &&\
1.115 - $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
1.116 - -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
1.117 + $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
1.118 + $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
1.119 + -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
1.120 fi;
1.121 $(TOUCH) $$@
1.122
