Changeset 23087 for lang/cplusplus

Timestamp:

11/10/08 07:36:02 (5 years ago)

Author:

saturday06

Message:

japanese ready!

Location:

lang/cplusplus/i3

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• scripts/filter_warnings.rb (modified) (1 diff)
• scripts/make_libintl_dll.sh (modified) (1 diff)
• windows/bin/libintl.dll (modified) (previous)

lang/cplusplus/i3/Makefile.am

@@ -27 +27 @@
  -Wpointer-arith \
  -Winit-self \
- -Weffc++ 
+ -Weffc++ \
+ -Wno-non-virtual-dtor
+
 # -Wpadded 
-# -Wunsafe-loop-optimizations 
+# -Wunsafe-loop-optimizations
 
 else
@@ -47 +49 @@
 include am/mol_test_debug.am
 
-if ENABLE_TEST
-bin_PROGRAMS += i3_test mol_test
 if ENABLE_DEBUG
-bin_PROGRAMS += i3_test_debug mol_test_debug
-endif
-endif
-
-if ENABLE_DEBUG
-bin_PROGRAMS  += i3_debug 
+bin_PROGRAMS  += i3_test mol_test i3_debug i3_test_debug mol_test_debug
 if USE_GCH
 BUILT_SOURCES += ${gch_files}

lang/cplusplus/i3/configure.ac

@@ -23 +23 @@
 AC_PROG_CC
 AC_PROG_CXX
-AM_CONDITIONAL(USE_GCH, test "$GXX" = "yes")
+AM_CONDITIONAL(USE_GCH,     test "$GXX" = "yes")
 
 # ---------------------------------------
 # Options
-
-AC_ARG_ENABLE(test,
-    AS_HELP_STRING([--enable-test], [build test binaries]),
-        enable_test="$enableval", enable_test="no")
-AM_CONDITIONAL(ENABLE_TEST, test "$enable_test" = "yes")
 
 AC_ARG_ENABLE(debug,
@@ -37 +32 @@
         enable_debug="$enableval", enable_debug="no")
 AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+
+if test "$enable_debug" = "yes"; then
+  if test -z "$CFLAGS"; then
+    CFLAGS="-g"
+  fi
+  if test -z "$CXXFLAGS"; then
+    CXXFLAGS="-g"
+  fi
+fi
 
 # ---------------------------------------

lang/cplusplus/i3/scripts/filter_warnings.rb

@@ -1 +1 @@
 # coding: utf-8
 
+buffer = ""
+STDIN.each do |line|
+  buffer += line
+  if line.match(/(warning|error)/)
+    if !line.match(/^\/usr/) && !line.match(/has a non-virtual destructor/)
+      print buffer
+    end
+    buffer = ""
+  end
+end
 
 
-

lang/cplusplus/i3/scripts/make_libintl_dll.sh

@@ -1 +1 @@
 
-target_host=i586-mingw32msvc
-#PATH=/mingw/bin:/bin
+# for cross compile
+#target_host=i586-mingw32msvc
 
+# tmp directory to work
 mytmpdir=`pwd`/tmp_make_libintl_dll
 rm -rf $mytmpdir
 mkdir -p $mytmpdir
 
+# mingw PATH
+uname_s=`uname -s`
+if [ `expr $uname_s : MINGW` != "0" ]; then
+  PATH=/mingw/bin:/bin
+fi
+
+# execute script
 env -i mytmpdir="$mytmpdir" target_host="$target_host" PATH="$PATH" TMP="$TMP" /bin/sh -c '
 if [ -n "$target_host" ]; then