Changeset 36146

Timestamp:

12/16/09 03:22:32 (3 years ago)

Author:

saturday06

Message:

ajiodf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• configure.ac (modified) (7 diffs)
• scripts/ac_init_version.sh (modified) (1 diff)
• src/mil/include/mil/PrecompiledHeaders.h (modified) (3 diffs)
• src/mil/include/mil/Synchronize.h (modified) (5 diffs)

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

@@ -24 +24 @@
 AC_PROG_CXXCPP # for cygwin
 AC_PROG_CXX
+AC_PROG_CPP_WERROR
 #AC_PROG_OBJC
 AC_LANG([C++])
@@ -103 +104 @@
 
         #AC_CHECK_PROG(GNUSTEP_CONFIG, gnustep-config)
-        which gnustep-config > /dev/null
-        if test $? -eq 0; then
-            GNUSTEP_CONFIG="gnustep-config"
+
+        for command in \
+            "$GNUSTEP_CONFIG" \
+            gnustep-config \
+            ~/GNUstep/System/Tools/gnustep-config \
+            /usr/local/GNUstep/System/Tools/gnustep-config \
+            /usr/GNUstep/System/Tools/gnustep-config \
+            ; do
+            which $command > /dev/null
+            if test $? -eq 0; then
+                GNUSTEP_CONFIG=$command
+                break
+            fi
+        done         
+
+        if test "$GNUSTEP_CONFIG" != ""; then
             if test "$enable_debug" = "yes"; then
                 debug_arg="--debug"
@@ -132 +146 @@
 if test "$with_gui" != "windows"; then
     AC_MSG_CHECKING([for Objective C++])
-    prologue="class Foo {}; @interface Bar {} @end @implementation Bar @end"
     body="Foo foo; Bar* bar;"
     LDFLAGS_ORIG="$LDFLAGS"
     LDFLAGS="$LDFLAGS -xobjective-c++"
     AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[$prologue]], [[$body]])],
+        [AC_LANG_PROGRAM(
+            [[
+#import <Cocoa/Cocoa.h>
+class Foo {};
+@interface Bar {}
+@end
+@implementation Bar
+@end 
+            ]],
+            [[$body]])],
         [AC_MSG_RESULT([yes])],
         [AC_MSG_FAILURE([Objective C++ compiler/linker does not work])])
@@ -143 +165 @@
 fi
 
-AC_PROG_CPP_WERROR
 AC_CHECK_HEADERS([__NON__EXISTANT__HEADER__FILE__],
                  [AC_MSG_FAILURE([no error when include file is not found])])
@@ -217 +238 @@
 
 AC_MSG_CHECKING([for unnamed semaphore])
-prog="sem_t sem; return (sem_init(&sem, 0, 0) == 0) ? EXIT_SUCCESS : EXIT_FAILURE;"
+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]])],
@@ -239 +261 @@
 CXXFLAGS_ORIG="$CXXFLAGS"
 AC_MSG_CHECKING([for __sync_bool_compare_and_swap])
-prog="int data = 0;  __sync_bool_compare_and_swap(&data, 0, 1);"
 
 gcc_atomic_operations_found() {
@@ -246 +267 @@
 }
 
+body="int data = 0;  __sync_bool_compare_and_swap(&data, 0, 1);"
+
 AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]], [[$prog]])],
+    [AC_LANG_PROGRAM([[]], [[$body]])],
     [gcc_atomic_operations_found],
     [
         CXXFLAGS="$CXXFLAGS -march=$host_cpu"
         AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM([[]], [[$prog]])],
+            [AC_LANG_PROGRAM([[]], [[$body]])],
             [gcc_atomic_operations_found],
             [AC_MSG_RESULT([no]); CXXFLAGS="$CXXFLAGS_ORIG"])])

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

@@ -18 +18 @@
 fi
 
-REVISION=`LC_ALL=en svn info | grep "Last Changed Rev:" | head -n 1 | cut -d ' ' -f 4`
+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

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/PrecompiledHeaders.h

@@ -39 +39 @@
 
 #if defined(MIL_GUI_COCOA)
+
+//#define class MIL_REPLACE_class
+//#import <AppKit/NSObjectController.h>
+//#undef class
+
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
@@ -44 +49 @@
 #include "gui-cocoa/PrecompiledHeaders.h"
 
-//#define Object MIL_BOOST_replace_Object
+//#define Object MIL_REPLACE_Object
 //#include <boost/lambda/lambda.hpp>
 //#undef Object
@@ -50 +55 @@
 #ifdef __APPLE__
 #ifdef HAVE_BOOST_DETAIL_IS_INCREMENTABLE_HPP
-#define check MIL_BOOST_replace_check
+#define check MIL_REPLACE_check
 #include <boost/ptr_container/detail/static_move_ptr.hpp>
 #undef check

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Synchronize.h

@@ -9 +9 @@
 #include <unistd.h>
 #include <sched.h>
+#include <boost/cstdint.hpp>
 
 /**
@@ -61 +62 @@
 };
 
-#ifdef __APPLE__
 class Semaphore {
-    Mutex mutex;
-    unsigned int value;
-public:
-    Semaphore() : value(0) {
+    sem_t unnamed_sem;
+    sem_t* psem;
+public:
+    Semaphore() {
+
+#ifdef HAVE_UNNAMED_SEMAPHOREfoo
+        if (sem_init(&unnamed_sem, 0, 0) == -1) {
+            halt << "sem_init() failed";
+        }
+        psem = &unnamed_sem;
+#else
+        std::stringstream name;
+        name << "/" PACKAGE_NAME PACKAGE_VERSION "-pid" << getpid();
+        psem = sem_open(name.str().c_str(), O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IXUSR, 0);
+        if (reinterpret_cast<intptr_t>(psem) ==
+            reinterpret_cast<intptr_t>(-1)) {
+            halt << "sem_open() failed";
+        }
+#endif
+
     }
 
     void passeren() {
+        sem_post(psem);
     }
 
@@ -77 +94 @@
 
     void verhoog() {
+        sem_wait(psem);
     }
 
@@ -84 +102 @@
 
     ~Semaphore() {
-    }
-};
-#else
-class Semaphore {
-    sem_t sem;
-public:
-    Semaphore() {
-        if (sem_init(&sem, 0, 0) == -1) {
-            halt << "Semaphore(): failed";
-        }
-    }
-
-    void passeren() {
-        sem_post(&sem);
-    }
-
-    void p() {
         passeren();
-    }
-
-    void verhoog() {
-        sem_wait(&sem);
-    }
-
-    void v() {
-        verhoog();
-    }
-
-    ~Semaphore() {
-        passeren();
-        for (size_t retry = 500; sem_destroy(&sem) == -1; retry--) {
+        for (size_t retry = 500; sem_destroy(psem) == -1; retry--) {
             if (!retry) {
                 halt << "~Semaphore(): failed.";
@@ -123 +112 @@
     }
 };
-#endif
 
 }