Permalink
Browse files

do use copy beam files from other tsung applications when building bo…

…ot files
  • Loading branch information...
nniclausse committed Sep 20, 2010
1 parent 813ea04 commit 2a63225177449f4fc9f670bd5928dc025527b091
Showing with 9 additions and 6 deletions.
  1. +9 −6 Makefile.in
View
@@ -296,8 +296,8 @@ boot: tsung priv/tsung.boot priv/tsung_recorder.boot priv/tsung_controller.boot
priv/tsung.boot: builder.beam $(SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(APPLICATION)-$(VERSION)/ebin
+ @cp $(TARGET) $(LIB_TARGET) temp/lib/$(APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(APPLICATION) temp/lib/$(APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(APPLICATION)-$(VERSION)/priv
@@ -308,14 +308,15 @@ priv/tsung.boot: builder.beam $(SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"
priv/tsung_controller.boot: builder.beam $(CONTROLLER_SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
+ @cp $(CONTROLLER_TARGET) temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(CONTROLLER_APPLICATION) temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/priv
@@ -325,14 +326,15 @@ priv/tsung_controller.boot: builder.beam $(CONTROLLER_SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"
priv/tsung_recorder.boot: builder.beam $(RECORDER_SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(RECORDER_APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
+ @cp $(RECORDER_TARGET) temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(RECORDER_APPLICATION) temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/priv
@@ -342,6 +344,7 @@ priv/tsung_recorder.boot: builder.beam $(RECORDER_SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"

0 comments on commit 2a63225

Please sign in to comment.