54 ifneq ($$(filter $7,$4),) |
54 ifneq ($$(filter $7,$4),) |
55 $4_OLDIMPLBASE:=-oldImplBase |
55 $4_OLDIMPLBASE:=-oldImplBase |
56 $4_OLDIMPLBASE_MSG:=with -oldImplBase |
56 $4_OLDIMPLBASE_MSG:=with -oldImplBase |
57 endif |
57 endif |
58 $5 : $4 |
58 $5 : $4 |
59 mkdir -p $3/$$($4_TMPDIR) |
59 $(MKDIR) -p $3/$$($4_TMPDIR) |
60 rm -rf $3/$$($4_TMPDIR) |
60 $(RM) -rf $3/$$($4_TMPDIR) |
61 mkdir -p $(dir $5) |
61 $(MKDIR) -p $(dir $5) |
62 echo Compiling IDL $(patsubst $2/%,%,$4) |
62 $(ECHO) Compiling IDL $(patsubst $2/%,%,$4) |
63 $8 -td $3/$$($4_TMPDIR) \ |
63 $8 -td $3/$$($4_TMPDIR) \ |
64 -i $2/org/omg/CORBA \ |
64 -i $2/org/omg/CORBA \ |
65 -i $2/org/omg/PortableInterceptor \ |
65 -i $2/org/omg/PortableInterceptor \ |
66 -i $2/org/omg/PortableServer \ |
66 -i $2/org/omg/PortableServer \ |
67 -D CORBA3 -corba 3.0 \ |
67 -D CORBA3 -corba 3.0 \ |
68 -fall \ |
68 -fall \ |
69 $$($4_OLDIMPLBASE) \ |
69 $$($4_OLDIMPLBASE) \ |
70 $(PREFIXES) \ |
70 $(PREFIXES) \ |
71 $4 |
71 $4 |
72 rm -f $$(addprefix $3/$$($4_TMPDIR)/,$6) |
72 $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6) |
73 cp -rp $3/$$($4_TMPDIR)/* $3 |
73 $(CP) -rp $3/$$($4_TMPDIR)/* $3 |
74 (cd $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5) |
74 ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5) |
75 rm -rf $3/$$($4_TMPDIR) |
75 $(RM) -rf $3/$$($4_TMPDIR) |
76 endef |
76 endef |
77 |
77 |
78 define SetupIdlCompilation |
78 define SetupIdlCompilation |
79 # param 1 is for example BUILD_IDLS |
79 # param 1 is for example BUILD_IDLS |
80 # param 2,3,4,5,6,7,8 are named args. |
80 # param 2,3,4,5,6,7,8 are named args. |
91 |
91 |
92 # Remove any relative addressing in the paths. |
92 # Remove any relative addressing in the paths. |
93 $1_SRC := $$(abspath $$($1_SRC)) |
93 $1_SRC := $$(abspath $$($1_SRC)) |
94 $1_BIN := $$(abspath $$($1_BIN)) |
94 $1_BIN := $$(abspath $$($1_BIN)) |
95 # Find all existing java files and existing class files. |
95 # Find all existing java files and existing class files. |
96 $$(shell mkdir -p $$($1_SRC) $$($1_BIN)) |
96 $$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN)) |
97 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl") |
97 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl") |
98 $1_BINS := $$(shell find $$($1_BIN) -name "*.java") |
98 $1_BINS := $$(shell find $$($1_BIN) -name "*.java") |
99 # Prepend the source/bin path to the filter expressions. |
99 # Prepend the source/bin path to the filter expressions. |
100 $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES)) |
100 $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES)) |
101 $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES)) |
101 $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES)) |