Changeset 89

Timestamp:

08/17/06 14:42:26 (2 years ago)

Author:

jeffk@…

Message:

magic.mak now builds pkgtool-like script. Autodepend fixes for mac os x universal mode. doxygen cmd defaults. doxygen outputs to directory named after project name

Location:

trunk/libjdkmidi/trunk

Files:

• configure (modified) (2 diffs)
• docs/Doxyfile (modified) (3 diffs)
• magic.mak (modified) (14 diffs)
• src/jdkmidi_sequencer.cpp (modified) (1 diff)
• tools (added)

trunk/libjdkmidi/trunk/configure

@@ -84 +84 @@
 
 # additional tool specifications
-magic_DOXYGEN="${magic_DOXYGEN}"
+magic_DOXYGEN="${magic_DOXYGEN:-doxygen}"
 magic_CP=${magic_CP:-cp}
 magic_LN=${magic_LN:-ln}
@@ -94 +94 @@
 magic_MAKEFLAGS="${magic_MAKEFLAGS}"
 magic_INSTALL="${magic_INSTALL:-install}"
+magic_RSYNC="${magic_RSYNC:-rsync}"
 
 # Target platform definitions

trunk/libjdkmidi/trunk/docs/Doxyfile

@@ -4 +4 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = libjdkmidi
+PROJECT_NAME           = $(PROJECT)
 PROJECT_NUMBER         = 1
 OUTPUT_DIRECTORY       = .
@@ -73 +73 @@
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = $(TOP)/src $(TOP)/include $(TOP)/tests $(TOP)/examples
+INPUT                  = $(TOP)/src $(TOP)/include $(TOP)/tests $(TOP)/tools $(TOP)/examples
 FILE_PATTERNS          = 
 RECURSIVE              = YES
@@ -106 +106 @@
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html
+HTML_OUTPUT            = $(PROJECT)
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 

trunk/libjdkmidi/trunk/magic.mak

@@ -18 +18 @@
 RSYNC?=rsync
 RSYNC_OPTIONS?=-a --exclude='*~' --exclude='.svn' --exclude='CVS'
+PROJECT_CONFIG_TOOL?=$(PROJECT)-cfg
 
 TARGET_PLATFORM_GENERIC=1
@@ -110 +111 @@
 TARGET_MACOSX_SDK?=/Developer/SDKs/MacOSX10.4u.sdk
 COMPILE_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) -arch i386 -arch ppc
-#LINK_FLAGS+=-Wl,-syslibroot,$(TARGET_MACOSX_SDK)
+LINK_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) -arch i386 -arch ppc
+#-Wl,-syslibroot,$(TARGET_MACOSX_SDK)
 TARGET_USE_AR=0
 TARGET_USE_MACOSX_LIBTOOL=1
@@ -132 +134 @@
 HOST_USE_AR?=1
 HOST_USE_MACOSX_LIBTOOL?=0
+NATIVE_AUTODEPEND=1
 
 NATIVE_COMPILE.cpp=$(NATIVE_CXX) $(NATIVE_CXXFLAGS) -c
@@ -221 +224 @@
 HOST_PLATFORM_MACOSX=1
 NATIVE_PLATFORM_DIRS=macosx posix macosx-ppc macosx-i386
-AUTODEPEND=0
+NATIVE_AUTODEPEND=0
 HOST_MACOSX_SDK?=/Developer/SDKs/MacOSX10.4u.sdk
 NATIVE_COMPILE_FLAGS+=-isysroot $(HOST_MACOSX_SDK) -arch i386 -arch ppc
@@ -321 +324 @@
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.mm
-   @echo "CXX    : $(notdir $<)"
-   @$(COMPILE.mm) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @echo "CXX mm : $(notdir $<)"
+   @$(CXX) $(PREPROCESS_FLAGS) $(MMFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< &&   @$(COMPILE.mm) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.m
-   @echo "CC     : $(notdir $<)"
-   @$(COMPILE.m) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @echo "CC  m  : $(notdir $<)"
+   @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && @$(COMPILE.m) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.cpp
    @echo "CXX    : $(notdir $<)"
-   @$(CXX) $(PREPROCESS_FLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CXX) $(PREPROCESS_FLAGS)  -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.c
    @echo "CC     : $(notdir $<)"
-   @$(CC) $(PREPROCESS_FLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) -o $(OUTPUT_OBJ_DIR)/$*.o $<
-
+   @$(CC) $(PREPROCESS_FLAGS)  -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 ifeq ($(CROSS_COMPILING),1)
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.mm
-   @echo "NATIVE_CXX    : $(notdir $<)"
-   @$(NATIVE_COMPILE.mm) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @echo "NATIVE_CXX mm : $(notdir $<)"
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && @$(NATIVE_COMPILE.mm) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.m
-   @echo "NATIVE_CC     : $(notdir $<)"
-   @$(NATIVE_COMPILE.m) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @echo "NATIVE_CC  m  : $(notdir $<)"
+   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && @$(NATIVE_COMPILE.m) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cpp
    @echo "NATIVE_CXX    : $(notdir $<)"
-   @$(NATIVE_CXX) $(PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.c
    @echo "NATIVE_CC     : $(notdir $<)"
-   @$(NATIVE_CC) $(PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.c) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
-
+   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.c)  $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 endif
 
 $(OUTPUT_TOOLS_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
    @echo "LINKING tool: $(notdir $<)"
-   @$(LINK.cpp) $(LDFLAGS) -o $(OUTPUT_TOOLS_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
+   @$(LINK.cpp) $(LINK_FLAGS) $(LDFLAGS) -o $(OUTPUT_TOOLS_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
 
 $(OUTPUT_EXAMPLES_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
    @echo "LINKING example: $(notdir $<)"
-   @$(LINK.cpp) $(LDFLAGS) -o $(OUTPUT_EXAMPLES_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
+   @$(LINK.cpp) $(LINK_FLAGS) $(LDFLAGS) -o $(OUTPUT_EXAMPLES_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
 
 $(OUTPUT_TESTS_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
    @echo "LINKING test: $(notdir $<)"
-   @$(LINK.cpp) $(LDFLAGS) -o $(OUTPUT_TESTS_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
+   @$(LINK.cpp) $(LINK_FLAGS) $(LDFLAGS) -o $(OUTPUT_TESTS_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
 
 
@@ -374 +375 @@
 $(NATIVE_OUTPUT_TOOLS_DIR)/%$(NATIVE_EXE) : $(NATIVE_OUTPUT_OBJ_DIR)/%.o
    @echo "NATIVE_LINKING tool: $(notdir $<)"
-   @$(NATIVE_LINK.cpp) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_TOOLS_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
+   @$(NATIVE_LINK.cpp) $(NATIVE_LINK_FLAGS) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_TOOLS_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
 
 $(NATIVE_OUTPUT_EXAMPLES_DIR)/%$(NATIVE_EXE) : $(NATIVE_OUTPUT_OBJ_DIR)/%.o
    @echo "NATIVE_LINKING example: $(notdir $<)"
-   @$(NATIVE_LINK.cpp) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_EXAMPLES_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
+   @$(NATIVE_LINK.cpp) $(NATIVE_LINK_FLAGS) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_EXAMPLES_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
 
 $(NATIVE_OUTPUT_TESTS_DIR)/%$(NATIVE_EXE) : $(NATIVE_OUTPUT_OBJ_DIR)/%.o
    @echo "NATIVE_LINKING test: $(notdir $<)"
-   @$(NATIVE_LINK.cpp) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_TESTS_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
+   @$(NATIVE_LINK.cpp) $(NATIVE_LINK_FLAGS) $(NATIVE_LDFLAGS) -o $(NATIVE_OUTPUT_TESTS_DIR)/$*$(NATIVE_EXE) $< -L$(NATIVE_OUTPUT_LIB_DIR) -l$(PROJECT) $(NATIVE_LDLIBS)
 endif
 
 ifeq ($(DEBUG),1)
 COMPILE_FLAGS+=-g
+DEFINES+=DEBUG=1
 endif
 
 ifeq ($(NATIVE_DEBUG),1)
 NATIVE_COMPILE_FLAGS+=-g
+NATIVE_DEFINES+=DEBUG=1
 endif
 
@@ -406 +409 @@
 DEFINES?=
 
-PREPROCESS_FLAGS=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(DEFINES))
-NATIVE_PREPROCESS_FLAGS=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(NATIVE_DEFINES))
-
-COMPILE_FLAGS+=$(WARNINGS) $(OPTIMIZE) $(PREPROCESS_FLAGS)
-NATIVE_COMPILE_FLAGS+=$(NATIVE_WARNINGS) $(NATIVE_OPTIMIZE) $(NATIVE_PREPROCESS_FLAGS)
-
-CXXFLAGS+=$(COMPILE_FLAGS)
-CFLAGS+=$(COMPILE_FLAGS)
-MFLAGS+=$(COMPILE_FLAGS)
-MMFLAGS+=$(COMPILE_FLAGS)
-
-NATIVE_CXXFLAGS+=$(NATIVE_COMPILE_FLAGS)
-NATIVE_CFLAGS+=$(NATIVE_COMPILE_FLAGS)
-NATIVE_MFLAGS+=$(NATIVE_COMPILE_FLAGS)
-NATIVE_MMFLAGS+=$(NATIVE_COMPILE_FLAGS)
+PREPROCESS_FLAGS=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(DEFINES)) 
+NATIVE_PREPROCESS_FLAGS=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(NATIVE_DEFINES)) 
+
+COMPILE_FLAGS+=$(OPTIMIZE) $(WARNINGS)
+NATIVE_COMPILE_FLAGS+=$(NATIVE_OPTIMIZE) $(NATIVE_WARNINGS)
+
 
 LDLIBS+=
-LDFLAGS+=$(LINK_FLAGS)
+LDFLAGS+=
 
 NATIVE_LDLIBS+=
-NATIVE_LDFLAGS+=$(NATIVE_LINK_FLAGS)
+NATIVE_LDFLAGS+=
+
+CONFIG_TOOL_FILE = $(OUTPUT_TOOLS_DIR)/$(PROJECT_CONFIG_TOOL)
+CONFIG_TOOL_PREPROCESS_FLAGS=$(addprefix -I,$(INSTALL_INCLUDE_DIR)) $(addprefix -D,$(DEFINES))
+CONFIG_TOOL_COMPILE_FLAGS+=$(WARNINGS) $(OPTIMIZE) $(CONFIG_TOOL_PREPROCESS_FLAGS) $(COMPILE_FLAGS)
+
+
 
 # get the list of library source files from the ../src directory
@@ -500 +500 @@
 
 ifeq ($(CROSS_COMPILING),1)
-all : native-dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples 
+all : native-dirs dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples 
 else
 all : dirs lib tools tests examples 
@@ -532 +532 @@
 .PHONY : tools
 
-tools : lib $(LIB_TOOLS_EXE_FILES)
-   
+tools : lib $(LIB_TOOLS_EXE_FILES) config-tool
 
 .PHONY : examples
 
 examples: lib $(LIB_EXAMPLES_EXE_FILES)
-   
 
 .PHONY : tests
@@ -547 +545 @@
 .PHONY : install
 
-install : lib tools
+install : lib tools tests examples 
    @-$(MKDIR) -p $(INSTALL_BIN_DIR)
-   for i in $(LIB_TOOLS_EXE_FILES); do $(INSTALL) $${i} $(INSTALL_BIN_DIR); done
+   @for i in $(LIB_TOOLS_EXE_FILES); do echo "$${i}"; $(INSTALL) "$${i}" "$(INSTALL_BIN_DIR)"; done
 
 .PHONY : install-dev
@@ -557 +555 @@
    @$(RSYNC) $(RSYNC_OPTIONS) $(LIB_INCLUDE_DIR)/* $(INSTALL_INCLUDE_DIR) 
    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_LIB) $(INSTALL_LIB_DIR) 
+   @echo $(PROJECT_CONFIG_TOOL)
+   @$(INSTALL) "$(CONFIG_TOOL_FILE)" "$(INSTALL_BIN_DIR)"
 
 .PHONY : install-dev-docs
@@ -562 +562 @@
 install-dev-docs : docs install-dev
    @-$(MKDIR) -p $(INSTALL_DOCS_DIR)
-   @$(SYNC) $(RSYNC_OPTIONS) $(OUTPUT_DOCS_DIR)/* $(INSTALL_DOCS_DIR)
+   @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_DOCS_DIR)/* $(INSTALL_DOCS_DIR)
 
 .PHONY : test
@@ -638 +638 @@
 
 native-tools : native-lib $(NATIVE_LIB_TOOLS_EXE_FILES)
-   
+
 .PHONY : native-examples
 
 native-examples: native-lib $(NATIVE_LIB_EXAMPLES_EXE_FILES)
-   
+
 .PHONY : native-tests
 
@@ -662 +662 @@
    done
 
-
-endif
+endif
+
+.PHONY : config-tool
+
+config-tool : $(CONFIG_TOOL_FILE)
+
+$(CONFIG_TOOL_FILE) :
+   @-rm -f $(CONFIG_TOOL_FILE)
+   @echo '#!/bin/bash' >$(CONFIG_TOOL_FILE)
+   @echo 'case "$$1" in' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--ldflags) echo $(LINK_FLAGS) $(LDFLAGS) -L$(INSTALL_LIB_DIR);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--ldlibs) echo $(LDLIBS) -l$(PROJECT);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--cflags) echo $(CFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--cxxflags) echo $(CXXFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--mflags) echo $(MFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--mmflags) echo $(MMFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
+   @echo 'esac' >>$(CONFIG_TOOL_FILE)
+   @chmod +x $(CONFIG_TOOL_FILE)
 
 .PHONY : compile_info

trunk/libjdkmidi/trunk/src/jdkmidi_sequencer.cpp

@@ -1025 +1025 @@
       
       MIDIClockTime new_clock;
-      float new_time_ms;
+      float new_time_ms=0.0f;
       
       GetNextEventTime( &new_clock );