Changeset 84 for trunk/libjdkmidi/trunk

Timestamp:

08/14/06 21:48:22 (2 years ago)

Author:

jeffk@…

Message:

configure script and magic.mak refactored a bit. More work yet to do for auto-detect stuff, but it is much nicer now and configure command line usage is more like autoconf

Location:

trunk/libjdkmidi/trunk

Files:

• configure (modified) (2 diffs)
• magic.mak (modified) (2 diffs)
• project.mak (modified) (1 diff)

trunk/libjdkmidi/trunk/configure

@@ -9 +9 @@
 
 # parse all long options and set them as variables, allowing command line to override everything
+# options are in the form of:
+#   --abcd-efghi-jklmn=some_value
+#
+# and they get transformed via awk into environment vars in the form:
+#   magic_ABCD_EFGHI_JKLMN="some_value"
+#
+# A bunch of variables have default values but can be overriden by the command line
+# 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
 
-for i in "$@"
-do 
-   p=$(echo "$i" | sed -E 's/^\-\-(.*)=(.*)/\1="\2"/')
-   eval $p
-done
+
+params=$((
+  for i in "$@"
+  do 
+    echo $i
+  done
+) | awk -F= '{ gsub("-","_",$1); sub("__","",$1); print "magic_" toupper($1) "=" "\"" $2 "\""; }'; )
+
+
+eval $params
 
 # setup all defaults:
@@ -20 +34 @@
 # directories
 
-magic_PROJECT_TOP_DIR="${PWD}/${relative_dir}"
-magic_PREFIX="${prefix:-${PWD}/install}"
+magic_PROJECT_TOP_DIR="${magic_PROJECT_TOP_DIR:-${PWD}/${relative_dir}}"
+magic_PREFIX="${magic_PREFIX:-${PWD}/install}"
 magic_INSTALL_DIR="${magic_PREFIX}"
 
 # additional tool specifications
-magic_DOXYGEN="${doxygen}"
-magic_CP=${cp:-cp}
-magic_LN=${ln:-ln}
-magic_RM=${rm:-rm}
-magic_MKDIRS="${mkdirs:-mkdir}"
-magic_MKDIR="${mkdir:-mkdir}"
-magic_VALGRIND="${valgrind:-valgrind}"
-magic_VALGRIND_OPTIONS="${valgrind_options}"
-magic_MAKEFLAGS="${makeflags}"
-magic_INSTALL="${install:-install}"
+magic_DOXYGEN="${magic_DOXYGEN}"
+magic_CP=${magic_CP:-cp}
+magic_LN=${magic_LN:-ln}
+magic_RM=${magic_RM:-rm}
+magic_MKDIRS="${magic_MKDIRS:-mkdir}"
+magic_MKDIR="${magic_MKDIR:-mkdir}"
+magic_VALGRIND="${magic_VALGRIND:-valgrind}"
+magic_VALGRIND_OPTIONS="${magic_VALGRIND_OPTIONS}"
+magic_MAKEFLAGS="${magic_MAKEFLAGS}"
+magic_INSTALL="${magic_INSTALL:-install}"
 
 # Target platform definitions
 
-magic_TARGET_PLATFORM_GENERIC="${target_platform_generic}"
-magic_TARGET_PLATFORM_MINGW32="${target_platform_mingw32}"
-magic_TARGET_PLATFORM_CYGWIN="${target_platform_cygwin}"
-magic_TARGET_PLATFORM_LINUX="${target_platform_linux}"
-magic_TARGET_PLATFORM_MACOSX_PPC="${target_platform_macosx_ppc}"
-magic_TARGET_PLATFORM_MACOSX_I386="${target_platform_macosx_i386}"
-magic_TARGET_PLATFORM_MACOSX_UNIVERSAL="${target_platform_macosx_universal}"
-magic_TARGET_USE_AR="${target_use_ar:-1}"
-magic_TARGET_USE_MACOSX_LIBTOOL="${target_use_macosx_libtool:-0}"
+magic_TARGET_PLATFORM_GENERIC="${magic_TARGET_PLATFORM_GENERIC}"
+magic_TARGET_PLATFORM_MINGW32="${magic_TARGET_PLATFORM_MINGW32}"
+magic_TARGET_PLATFORM_CYGWIN="${magic_TARGET_PLATFORM_CYGWIN}"
+magic_TARGET_PLATFORM_LINUX="${magic_TARGET_PLATFORM_LINUX}"
+magic_TARGET_PLATFORM_MACOSX_PPC="${magic_TARGET_PLATFORM_MACOSX_PPC}"
+magic_TARGET_PLATFORM_MACOSX_I386="${magic_TARGET_PLATFORM_MACOSX_I386}"
+magic_TARGET_PLATFORM_MACOSX_UNIVERSAL="${magic_TARGET_PLATFORM_MACOSX_UNIVERSAL}"
+magic_TARGET_USE_AR="${magic_TARGET_USE_AR:-1}"
+magic_TARGET_USE_MACOSX_LIBTOOL="${magic_TARGET_USE_MACOSX_LIBTOOL:-0}"
 
-magic_TARGET_MACOSX_SDK="${target_macosx_sdk:-/Developer/SDKs/MacOSX10.4u.sdk}"
+magic_TARGET_MACOSX_SDK="${magic_TARGET_MACOSX_SDK:-/Developer/SDKs/MacOSX10.4u.sdk}"
 
 # Target compile options
 
-magic_DEBUG="${debug}"
-magic_PROFILE="${profile}"
-magic_OPTIMIZE="${optimize}"
-magic_WARNINGS="${warnings}"
-magic_AUTODEPEND="${autodepend}"
-magic_DEFINES="${defines}"
+magic_DEBUG="${magic_DEBUG}"
+magic_PROFILE="${magic_PROFILE}"
+magic_OPTIMIZE="${magic_OPTIMIZE}"
+magic_WARNINGS="${magic_WARNINGS}"
+magic_AUTODEPEND="${magic_AUTODEPEND}"
+magic_DEFINES="${magic_DEFINES}"
+magic_INCLUDES="${magic_INCLUDES}"
 
 # Target compiler specifications
-magic_CC="${cc:-${compiler_prefix}gcc}"
-magic_CXX="${cxx:-${compiler_prefix}g++}"
-magic_NM="${nm:-${compiler_prefix}nm}"
-magic_AR="${ar:-${compiler_prefix}ar}"
-magic_RANLIB="${ranlib:-${compiler_prefix}ranlib}"
-magic_LD="${ld:-${compiler_prefix}ld}"
-magic_AS="${as:-${compiler_prefix}as}"
-magic_STRIP="${strip:-${compiler_prefix}strip}"
-magic_STRINGS="${strings:-${compiler_prefix}strings}"
-magic_WINDRES="${windres:-${compiler_prefix}windres}"
-magic_OBJDUMP="${objdump:-${compiler_prefix}objdump}"
-magic_DLLTOOL="${dlltool:-${compiler_prefix}dlltool}"
-magic_DLLWRAP="${dllwrap:-${compiler_prefix}dllwrap}"
-magic_LDFLAGS="${ldflags}"
-magic_CXXFLAGS="${cxxflags}"
-magic_CFLAGS="${cflags}"
-magic_MFLAGS="${mflags}"
-magic_MMFLAGS="${mmflags}"
-magic_LDLIBS="${ldlibs}"
+magic_CC="${magic_CC:-${magic_COMPILER_PREFIX}gcc}"
+magic_CXX="${magic_CXX:-${magic_COMPILER_PREFIX}g++}"
+magic_NM="${magic_NM:-${magic_COMPILER_PREFIX}nm}"
+magic_AR="${magic_AR:-${magic_COMPILER_PREFIX}ar}"
+magic_ARFLAGS="${magic_ARFLAGS:-rv}"
+magic_RANLIB="${magic_RANLIB:-${magic_COMPILER_PREFIX}ranlib}"
+magic_LD="${magic_LD:-${magic_COMPILER_PREFIX}ld}"
+magic_AS="${magic_AS:-${magic_COMPILER_PREFIX}as}"
+magic_STRIP="${magic_STRIP:-${magic_COMPILER_PREFIX}strip}"
+magic_STRINGS="${magic_STRINGS:-${magic_COMPILER_PREFIX}strings}"
+magic_WINDRES="${magic_WINDRES:-${magic_COMPILER_PREFIX}windres}"
+magic_OBJDUMP="${magic_OBJDUMP:-${magic_COMPILER_PREFIX}objdump}"
+magic_DLLTOOL="${magic_DLLTOOL:-${magic_COMPILER_PREFIX}dlltool}"
+magic_DLLWRAP="${magic_DLLWRAP:-${magic_COMPILER_PREFIX}dllwrap}"
+magic_LDFLAGS="${magic_LDFLAGS}"
+magic_CXXFLAGS="${magic_CXXFLAGS}"
+magic_CFLAGS="${magic_CFLAGS}"
+magic_MFLAGS="${magic_MFLAGS}"
+magic_MMFLAGS="${magic_MMFLAGS}"
+magic_LDLIBS="${magic_LDLIBS}"
 
 # Host platform specifications
 
-magic_HOST_PLATFORM_GENERIC="${host_platform_generic}"
-magic_HOST_PLATFORM_MINGW32="${host_platform_mingw32}"
-magic_HOST_PLATFORM_CYGWIN="${host_platform_cygwin}"
-magic_HOST_PLATFORM_LINUX="${host_platform_linux}"
-magic_HOST_PLATFORM_MACOSX_PPC="${host_platform_macosx_ppc}"
-magic_HOST_PLATFORM_MACOSX_I386="${host_platform_macosx_i386}"
-magic_HOST_PLATFORM_MACOSX_UNIVERSAL="${host_platform_macosx_universal}"
-magic_HOST_USE_AR="${host_use_ar:-1}"
-magic_HOST_USE_MACOSX_LIBTOOL="${host_use_macosx_libtool:-0}"
-magic_HOST_MACOSX_SDK="${host_macosx_sdk:-/Developer/SDKs/MacOSX10.4u.sdk}"
+magic_HOST_PLATFORM_GENERIC="${magic_HOST_PLATFORM_GENERIC}"
+magic_HOST_PLATFORM_MINGW32="${magic_HOST_PLATFORM_MINGW32}"
+magic_HOST_PLATFORM_CYGWIN="${magic_HOST_PLATFORM_CYGWIN}"
+magic_HOST_PLATFORM_LINUX="${magic_HOST_PLATFORM_LINUX}"
+magic_HOST_PLATFORM_MACOSX_PPC="${magic_HOST_PLATFORM_MACOSX_PPC}"
+magic_HOST_PLATFORM_MACOSX_I386="${magic_HOST_PLATFORM_MACOSX_I386}"
+magic_HOST_PLATFORM_MACOSX_UNIVERSAL="${magic_HOST_PLATFORM_MACOSX_UNIVERSAL}"
+magic_HOST_USE_AR="${magic_HOST_USE_AR:-1}"
+magic_HOST_USE_MACOSX_LIBTOOL="${magic_HOST_USE_MACOSX_LIBTOOL:-0}"
+magic_HOST_MACOSX_SDK="${magic_HOST_MACOSX_SDK:-/Developer/SDKs/MacOSX10.4u.sdk}"
 
 # Native compiler specifications
 
-magic_CROSS_COMPILING="${cross_compiling:-0}"
-magic_NATIVE_CC="${cc:-${native_compiler_prefix}gcc}"
-magic_NATIVE_CXX="${cxx:-${native_compiler_prefix}g++}"
-magic_NATIVE_NM="${nm:-${native_compiler_prefix}nm}"
-magic_NATIVE_AR="${ar:-${native_compiler_prefix}ar}"
-magic_NATIVE_RANLIB="${ranlib:-${native_compiler_prefix}ranlib}"
-magic_NATIVE_LD="${LD:-${native_compiler_prefix}g++}"
-magic_NATIVE_AS="${AS:-${native_compiler_prefix}as}"
-magic_NATIVE_STRIP="${strip:-${native_compiler_prefix}strip}"
-magic_NATIVE_STRINGS="${strings:-${native_compiler_prefix}strings}"
-magic_NATIVE_WINDRES="${windres:-${native_compiler_prefix}windres}"
-magic_NATIVE_OBJDUMP="${objdump:-${native_compiler_prefix}objdump}"
-magic_NATIVE_DLLTOOL="${dlltool:-${native_compiler_prefix}dlltool}"
-magic_NATIVE_DLLWRAP="${dllwrap:-${native_compiler_prefix}dllwrap}"
-magic_NATIVE_LDFLAGS="${native_ldflags}"
-magic_NATIVE_CXXFLAGS="${native_cxxflags}"
-magic_NATIVE_MFLAGS="${native_mflags}"
-magic_NATIVE_MMFLAGS="${native_mmflags}"
-magic_NATIVE_CFLAGS="${native_cflags}"
-magic_NATIVE_LDLIBS="${native_ldlibs}"
-magic_NATIVE_DEBUG="${native_debug}"
-magic_NATIVE_PROFILE="${native_profile}"
+magic_CROSS_COMPILING="${magic_CROSS_COMPILING:-0}"
+magic_NATIVE_COMPILER_PREFIX="${magic_NATIVE_COMPILER_PREFIX:-}"
+magic_NATIVE_CC="${magic_NATIVE_CC:-${magic_NATIVE_COMPILER_PREFIX}gcc}"
+magic_NATIVE_CXX="${magic_NATIVE_CXX:-${magic_NATIVE_COMPILER_PREFIX}g++}"
+magic_NATIVE_NM="${magic_NATIVE_NM:-${magic_NATIVE_COMPILER_PREFIX}nm}"
+magic_NATIVE_AR="${magic_NATIVE_AR:-${magic_NATIVE_COMPILER_PREFIX}ar}"
+magic_NATIVE_ARFLAGS="${magic_NATIVE_ARFLAGS:-rv}"
+magic_NATIVE_RANLIB="${magic_NATIVE_RANLIB:-${magic_NATIVE_COMPILER_PREFIX}ranlib}"
+magic_NATIVE_LD="${magic_NATIVE_LD:-${magic_NATIVE_COMPILER_PREFIX}g++}"
+magic_NATIVE_AS="${magic_NATIVE_AS:-${magic_NATIVE_COMPILER_PREFIX}as}"
+magic_NATIVE_STRIP="${magic_NATIVE_STRIP:-${magic_NATIVE_COMPILER_PREFIX}strip}"
+magic_NATIVE_STRINGS="${magic_NATIVE_STRINGS:-${magic_NATIVE_COMPILER_PREFIX}strings}"
+magic_NATIVE_WINDRES="${magic_NATIVE_WINDRES:-${magic_NATIVE_COMPILER_PREFIX}windres}"
+magic_NATIVE_OBJDUMP="${magic_NATIVE_OBJDUMP:-${magic_NATIVE_COMPILER_PREFIX}objdump}"
+magic_NATIVE_DLLTOOL="${magic_NATIVE_DLLTOOL:-${magic_NATIVE_COMPILER_PREFIX}dlltool}"
+magic_NATIVE_DLLWRAP="${magic_NATIVE_DLLWRAP:-${magic_NATIVE_COMPILER_PREFIX}dllwrap}"
+magic_NATIVE_LDFLAGS="${magic_NATIVE_LDFLAGS}"
+MAGIC_NATIVE_CXXFLAGS="${magic_NATIVE_CXXFLAGS}"
+magic_NATIVE_MFLAGS="${magic_NATIVE_MFLAGS}"
+MAGIC_NATIVE_MMFLAGS="${magic_NATIVE_MMFLAGS}"
+magic_NATIVE_CFLAGS="${magic_NATIVE_CFLAGS}"
+MAGIC_NATIVE_LDLIBS="${magic_NATIVE_LDLIBS}"
+magic_NATIVE_DEBUG="${magic_NATIVE_DEBUG}"
+MAGIC_NATIVE_PROFILE="${magic_NATIVE_PROFILE}"
 
 
-set | grep magic_ | sed -E 's/^magic_(.*)=(.*)/\1="${\1:-\2}"/' >vars.sh
+# extract all environment vars with the "magic_" prefix and save them in vars.sh and Makefile in the appropriate form:
 
-set | grep magic_ | sed -E 's/^magic_(.*)=(.*)/\1=\2/' >Makefile
+set | grep '^magic_' | awk -F= '{ sub("magic_","",$1); print $1 "=\"" $2 "\"" }' >vars.sh
+echo ". \"${magic_PROJECT_TOP_DIR}/project.sh\"" >>vars.sh
+set | grep '^magic_' | awk -F= '{ sub("magic_","",$1); print $1 "=" $2 }' >Makefile
+
 echo 'include $(PROJECT_TOP_DIR)/project.mak' >>Makefile
 echo 'include $(PROJECT_TOP_DIR)/magic.mak' >>Makefile
 
-echo "$0 $@" >./reconfigure
+if [ -f ./reconfigure ]; then
+ mv ./reconfigure ./reconfigure-old
+fi
+echo "$0 $@ " '$@' >./reconfigure
 chmod +x ./reconfigure
 

trunk/libjdkmidi/trunk/magic.mak

@@ -11 +11 @@
 
 LIBS+=
-LIB_DIRS+=$(addprefix $(PROJECT_TOP_DIR)/,$(LIBS))
+LIB_DIRS+=
+LIB_SRC_DIR=$(LIB_DIRS)
+
 
 TARGET_PLATFORM_GENERIC=1
@@ -591 +593 @@
    @echo "LINK_FLAGS: $(LINK_FLAGS)"
    @echo "LDLIBS: $(LDLIBS)"
-   @echo "OUTPUT_LIB: $(OUTPUT_LIB)"
+   @echo "OUTPUT_LIB: $(OUTPUT_LIB)"   
+   @echo "LIB_INCLUDE_DIR: $(LIB_INCLUDE_DIR)"
    @echo "LIB_SRC_DIR: $(LIB_SRC_DIR)"
    @echo "LIB_TESTS_DIR: $(LIB_TESTS_DIR)"

trunk/libjdkmidi/trunk/project.mak

@@ -6 +6 @@
 PROJECT_LICENSE='GPL'
 
-LIBS+=.
+LIB_DIRS+=$(PROJECT_TOP_DIR)
 
 DEFINES_MINGW32+=