Changeset 36190

Timestamp:

12/18/09 23:12:33 (4 years ago)

Author:

saturday06

Message:

asdf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• configure.ac (modified) (3 diffs)
• scripts/ac_init_version.sh (modified) (1 diff)
• src/Common.cpp (modified) (2 diffs)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -167 +167 @@
 if test "$with_gui" != "windows"; then
     AC_MSG_CHECKING([for Objective C++])
-    body="Foo foo; Bar* bar;"
     LDFLAGS_ORIG="$LDFLAGS"
     LDFLAGS="$LDFLAGS -xobjective-c++"
@@ -174 +173 @@
             [[
 #import <Cocoa/Cocoa.h>
-class Foo {};
-@interface Bar {}
+class Foo {
+};
+@interface Bar : NSObject
+{
+}
 @end
 @implementation Bar
 @end 
             ]],
-            [[$body]])],
+            [[
+Foo foo;
+Bar* bar = [[Bar alloc] init];
+[bar release];
+            ]])],
         [],
         [AC_MSG_FAILURE([Objective C++ compiler/linker does not work])])
@@ -274 +280 @@
 
 AC_MSG_CHECKING([for unnamed semaphore])
-prologue="#include <semaphore.h>"
-body="sem_t sem; return (sem_init(&sem, 0, 0) == 0) ? EXIT_SUCCESS : EXIT_FAILURE;"
-AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]], [[$prog]])],
+AC_RUN_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <stdlib.h>
+#include <semaphore.h>
+     ]], 
+     [[
+sem_t sem;
+if (sem_init(&sem, 0, 0) == 0) {
+    return EXIT_SUCCESS;
+} else {
+    return EXIT_FAILURE;
+}
+     ]])],
     [AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_UNNAMED_SEMAPHORE, 1, [Unnamed semaphore])],
     [AC_MSG_RESULT([no])],

lang/objective-cplusplus/i3/trunk/scripts/ac_init_version.sh

@@ -7 +7 @@
 VERSION="${I3_VERSION_MAJOR}.${I3_VERSION_MINOR}${I3_VERSION_EXTENSION}"
 
-if test "$I3_VERSION_EXTENSION" = ""; then
-    echo ${VERSION}
-    exit
-fi
-
-which svn > /dev/null 2> /dev/null
-if [ ${?} -ne 0 ]; then
-    echo ${VERSION}.unknown-revision
+svn status > /dev/null 2> /dev/null
+if test $? -ne 0; then
+    echo "${VERSION}.no-svn"
     exit
 fi
 
 REVISION=`LC_ALL=en svn info 2> /dev/null | grep "Last Changed Rev:" | head -n 1 | cut -d ' ' -f 4`
-UPDATES=`svn status | grep -v "^\?"`
-if [ "${UPDATES}" != "" ]; then
-    REVISION="${REVISION}.modified"
+if test "$REVISION" = ""; then
+    REVISION=unknown-revision
 fi
-echo ${VERSION}.r${REVISION}
 
+if test "$I3_VERSION_EXTENSION" != ""; then
+    VERSION="${VERSION}.r${REVISION}"
+fi
 
+UPDATES=`svn status 2> /dev/null | grep -v "^\?"`
+if test "${UPDATES}" != ""; then
+    VERSION="${VERSION}.modified"
+fi
 
+echo $VERSION
+

lang/objective-cplusplus/i3/trunk/src/Common.cpp

@@ -123 +123 @@
 error_exit:
     poptFreeContext(optCon);
-    return 1;
+    return EXIT_FAILURE;
 
     /*
@@ -194 +194 @@
       arg_freetable(argtable, _countof(argtable));
     */
-    return 1;
+    return EXIT_FAILURE;
 }
 }