equal
deleted
inserted
replaced
62 $(RM) $@ $@.tmp |
62 $(RM) $@ $@.tmp |
63 $(MKDIR) -p $(@D) |
63 $(MKDIR) -p $(@D) |
64 if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \ |
64 if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \ |
65 $(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\ |
65 $(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\ |
66 else \ |
66 else \ |
67 $(GBM) -F complete --framework $1 -o $@.tmp ; \ |
67 $(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \ |
68 fi |
68 fi |
69 $(MV) $@.tmp $@ |
69 $(MV) $@.tmp $@ |
70 endef |
70 endef |
71 |
71 |
72 # |
72 # |
86 # Find Xbootclasspath, for some reason, this involves firing up Java just |
86 # Find Xbootclasspath, for some reason, this involves firing up Java just |
87 # so we can get the boot classpath, so we can remove anything in that |
87 # so we can get the boot classpath, so we can remove anything in that |
88 # classpath that ends with "JObjC.jar", and emit the new bootclasspath. |
88 # classpath that ends with "JObjC.jar", and emit the new bootclasspath. |
89 # |
89 # |
90 $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER) |
90 $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER) |
|
91 $(ECHO) Generating jobjc framework bridge |
91 $(RM) $@ |
92 $(RM) $@ |
92 $(JAVA) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp |
93 $(JAVA) $(LOG_INFO) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp |
93 $(MV) $@.tmp $@ |
94 $(MV) $@.tmp $@ |
94 |
95 |
95 # |
96 # |
96 # Run generator |
97 # Run generator |
97 # Now we use bootclasspath to run java again, with the bridge support to |
98 # Now we use bootclasspath to run java again, with the bridge support to |
99 # Note the use of the | (order-only) on the BRIDGESUPPORT, should serialize |
100 # Note the use of the | (order-only) on the BRIDGESUPPORT, should serialize |
100 # them just in case GBM run in parallel has issues. |
101 # them just in case GBM run in parallel has issues. |
101 # |
102 # |
102 $(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath | $(BRIDGESUPPORT) |
103 $(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath | $(BRIDGESUPPORT) |
103 $(RM) $@ |
104 $(RM) $@ |
104 $(JAVA) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge |
105 $(JAVA) $(LOG_INFO) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge |
105 $(TOUCH) $@ |
106 $(TOUCH) $@ |
106 |
107 |
107 GENSRC_JOBJC += $(JOBJC_TMP)/_the.generator |
108 # The generator delets all files in the target dir so it has to work in its |
|
109 # own dir and have the files copied over to gensrc aftewards. |
|
110 $(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files : $(JOBJC_TMP)/_the.generator |
|
111 $(MKDIR) -p $(@D) |
|
112 $(CP) -rp $(JOBJC_DST)/* $(@D) |
|
113 $(TOUCH) $@ |
108 |
114 |
|
115 GENSRC_JOBJC += $(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files |