Changeset 88 for trunk/libjdkmidi/trunk

Timestamp:

08/17/06 10:53:11 (2 years ago)

Author:

jeffk@…

Message:

native-tests support when cross compiling. added help messages and make install* now uses rsync instead of cp

Location:

trunk/libjdkmidi/trunk

Files:

• configure (modified) (1 diff)
• magic.mak (modified) (9 diffs)

trunk/libjdkmidi/trunk/configure

@@ -60 +60 @@
 # at the end of this script, all variables with the "magic_" prefix are outputted to the Makefile and the vars.sh
 # in the appropriate format. The script file './reconfigure' is created with the current command line parameters
+
+# before we parse the command line arguments, do some rudimentary host machine investigation.
+
 
 

trunk/libjdkmidi/trunk/magic.mak

@@ -8 +8 @@
 PROJECT_VERSION?=$(shell date +%Y%m%d)
 
+BINARY_TARBALL_NAME?=$(PROJECT_NAME)-$(PROJECT_VERSION).tar.bz2
+
 CROSS_COMPILING?=0
 
@@ -14 +16 @@
 LIB_SRC_DIR=$(LIB_DIRS)
 
+RSYNC?=rsync
+RSYNC_OPTIONS?=-a --exclude='*~' --exclude='.svn' --exclude='CVS'
 
 TARGET_PLATFORM_GENERIC=1
@@ -496 +500 @@
 
 ifeq ($(CROSS_COMPILING),1)
-all : native_dirs native_lib native_tools native_tests native_examples dirs lib tools tests examples 
+all : native-dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples 
 else
 all : dirs lib tools tests examples 
@@ -551 +555 @@
 install-dev : install
    @-$(MKDIR) -p $(INSTALL_INCLUDE_DIR) $(INSTALL_LIB_DIR)
-   $(CP) -rp $(LIB_INCLUDE_DIR)/* $(INSTALL_INCLUDE_DIR) 
-   $(CP) -rp $(OUTPUT_LIB) $(INSTALL_LIB_DIR) 
+   @$(RSYNC) $(RSYNC_OPTIONS) $(LIB_INCLUDE_DIR)/* $(INSTALL_INCLUDE_DIR) 
+   @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_LIB) $(INSTALL_LIB_DIR) 
 
 .PHONY : install-dev-docs
@@ -558 +562 @@
 install-dev-docs : docs install-dev
    @-$(MKDIR) -p $(INSTALL_DOCS_DIR)
-   $(CP) -rp $(OUTPUT_DOCS_DIR)/* $(INSTALL_DOCS_DIR)
+   @$(SYNC) $(RSYNC_OPTIONS) $(OUTPUT_DOCS_DIR)/* $(INSTALL_DOCS_DIR)
 
 .PHONY : test
 
+ifeq ($(CROSS_COMPILING),1)
+test : native-test
+else
 test: lib tools $(LIB_TESTS_SH_FILES) $(LIB_TESTS_EXE_FILES)
    @cd "$(OUTPUT_TESTS_DIR)"; \
@@ -574 +581 @@
      if bash "$${i}" >"$${n}.out" 2>"$${n}.err"; then rm "$${n}.err"; echo SUCCESS:$${n}; else echo  FAIL:$${n}; fi;\
    done
+endif
 
 .PHONY : docs
@@ -607 +615 @@
 .PHONY : native_dirs
 
-native_dirs :
+native-dirs :
    -@$(MKDIR) -p $(NATIVE_ALL_OUTPUT_DIRS)
 
-.PHONY : native_lib
-
-native_lib : native_dirs $(NATIVE_OUTPUT_LIB)
+.PHONY : native-lib
+
+native-lib : native-dirs $(NATIVE_OUTPUT_LIB)
 
 $(NATIVE_OUTPUT_LIB) : $(NATIVE_LIB_O_FILES) 
@@ -629 +637 @@
 .PHONY : native_tools
 
-native_tools : native_lib $(NATIVE_LIB_TOOLS_EXE_FILES)
+native-tools : native-lib $(NATIVE_LIB_TOOLS_EXE_FILES)
    
-.PHONY : native_examples
-
-native_examples: native_lib $(NATIVE_LIB_EXAMPLES_EXE_FILES)
+.PHONY : native-examples
+
+native-examples: native-lib $(NATIVE_LIB_EXAMPLES_EXE_FILES)
    
-.PHONY : native_tests
-
-native_tests: native_lib $(NATIVE_LIB_TESTS_EXE_FILES)
+.PHONY : native-tests
+
+native-tests: native-lib $(NATIVE_LIB_TESTS_EXE_FILES)
+
+.PHONY : native-test
+
+native-test: native-lib native-tools $(LIB_TESTS_SH_FILES) $(NATIVE_LIB_TESTS_EXE_FILES)
+   @cd "$(NATIVE_OUTPUT_TESTS_DIR)"; \
+   for i in $(NATIVE_LIB_TESTS_EXE_FILES); \
+   do \
+     n=$$(basename $$i); \
+     if $(VALGRIND) $(VALGRIND_OPTIONS) "./$${n}" >"$${n}.out" 2>"$${n}.err"; then rm "$${n}.err"; echo SUCCESS:$${n}; else echo  FAIL:$${n}; fi;\
+   done; \
+   for i in $(LIB_TESTS_SH_FILES); \
+   do \
+     n=$$(basename $$i); \
+     if bash "$${i}" >"$${n}.out" 2>"$${n}.err"; then rm "$${n}.err"; echo SUCCESS:$${n}; else echo  FAIL:$${n}; fi;\
+   done
+
+
 endif
 
@@ -690 +715 @@
    @echo "clean : clean intermediatte files"
    @echo "distclean / realclean : clean all built files (except docs)"
-   @echo "tools : build tool programs"
-   @echo "examples : build example programs"
-   @echo "tests : build test programs"
+   @echo "tools : build tool programs $(LIB_TOOLS_EXE_FILES)"
+   @echo "examples : build example programs $(LIB_EXAMPLES_EXE_FILES)"
+   @echo "tests : build test programs $(LIB_TESTS_EXE_FILES)"
    @echo "test : run tests, sh scripts and test programs"
-   @echo "dirs : create output dirs"
+   @echo "dirs : create output dirs $(OUTPUT_DIR)"
    @echo "install : install tool executables files into $(INSTALL_DIR)"
    @echo "install-dev : install tool executables, include files and library files into $(INSTALL_DIR)"
    @echo "install-dev-docs : install tool executables, include files, library files, and doxygen docs into $(INSTALL_DIR)"
+ifeq ($(CROSS_COMPILING),1)
+   @echo "native-dirs : create output dirs for native build in $(NATIVE_OUTPUT_DIR)"
+   @echo "native-lib : build native library $(NATIVE_OUTPUT_LIB)"
+   @echo "native-tests : build native tests $(NATIVE_LIB_TESTS_EXE_FILES)"
+   @echo "native-test : run native tests."
+endif
 
 # include any dependencies created during the last make.