projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slightly closer but cleanups are still wrong.
[feisty_meow.git]
/
nucleus
/
makefile
diff --git
a/nucleus/makefile
b/nucleus/makefile
index 5e5c392a300605a0c0dfe6807d64088116799044..4f931027dfef143c96e4ebb1cbfd4d77ffe10063 100644
(file)
--- a/
nucleus/makefile
+++ b/
nucleus/makefile
@@
-4,12
+4,12
@@
include variables.def
# Set default locations for the following variables. If the build_variables
# have been sourced in, that takes care of setting these.
# Set default locations for the following variables. If the build_variables
# have been sourced in, that takes care of setting these.
-ifeq "$(FEISTY_MEOW_DIR)" ""
- export FEISTY_MEOW_DIR := $(CURRENT_DIR)
-endif
-ifeq "$(PRODUCTION_DIR)" ""
- export PRODUCTION_DIR = $(FEISTY_MEOW_DIR)/production
+ifeq "$(FEISTY_MEOW_APEX)" ""
+ export FEISTY_MEOW_APEX := $(CURRENT_DIR)
endif
endif
+#ifeq "$(PRODUCTION_DIR)" ""
+# export PRODUCTION_DIR = $(FEISTY_MEOW_APEX)/production
+#endif
ifeq "$(CLAM_DIR)" ""
export CLAM_DIR = $(FEISTY_MEOW_SCRIPTS)/clam
endif
ifeq "$(CLAM_DIR)" ""
export CLAM_DIR = $(FEISTY_MEOW_SCRIPTS)/clam
endif
@@
-18,18
+18,18
@@
include $(CLAM_DIR)/cpp/variables.def
PROJECT = feisty_meow_nucleus
TYPE = hierarchy
PROJECT = feisty_meow_nucleus
TYPE = hierarchy
-FIRST_TARGETS = do_make
+FIRST_TARGETS
+
= do_make
BUILD_AFTER = library applications tools
include $(CLAM_DIR)/cpp/rules.def
BUILD_AFTER = library applications tools
include $(CLAM_DIR)/cpp/rules.def
-do_make: start_make $(
PRODUCTION
_DIR)/binaries/manifest.txt end_make
+do_make: start_make $(
RUNTIME
_DIR)/binaries/manifest.txt end_make
start_make: show_date.start
end_make: show_date.end
start_make: show_date.start
end_make: show_date.end
-$(
PRODUCTION
_DIR)/binaries/manifest.txt: $(PARAMETER_FILE)
+$(
RUNTIME
_DIR)/binaries/manifest.txt: $(PARAMETER_FILE)
$(HIDESH) -c '\
if [ ! -d "$(EXECUTABLE_DIR)" ]; then mkdir -p "$(EXECUTABLE_DIR)"; fi; \
if [ $$? -ne 0 ]; then \
$(HIDESH) -c '\
if [ ! -d "$(EXECUTABLE_DIR)" ]; then mkdir -p "$(EXECUTABLE_DIR)"; fi; \
if [ $$? -ne 0 ]; then \
@@
-41,13
+41,12
@@
if [ $$? -ne 0 ]; then \
echo build failure while copying paths initialization file.; \
exit 1; \
fi; \
echo build failure while copying paths initialization file.; \
exit 1; \
fi; \
-echo cmd is: $(CLAM_BIN)/value_tagger$(EXE_END) $(PRODUCTION_DIR)/codescan.ini; \
-$(CLAM_BIN)/value_tagger$(EXE_END) $(PRODUCTION_DIR)/codescan.ini; \
+bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(CLAM_BINARY_DIR)/value_tagger$(EXE_END) $(PRODUCTION_DIR)/codescan.ini; \
if [ $$? -ne 0 ]; then \
echo build failure during value tagging.; \
exit 1; \
fi; \
if [ $$? -ne 0 ]; then \
echo build failure during value tagging.; \
exit 1; \
fi; \
-
$(CLAM_BIN
)/write_build_config$(EXE_END); \
+
bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(CLAM_BINARY_DIR
)/write_build_config$(EXE_END); \
if [ $$? -ne 0 ]; then \
echo build failure while writing config.; \
exit 1; \
if [ $$? -ne 0 ]; then \
echo build failure while writing config.; \
exit 1; \