Merge cdfb218 into e53179a

KjellSchubert · Feb 19, 2015 · 3b5daa3 · 3b5daa3
2 parents e53179a + cdfb218
commit 3b5daa3
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 17 deletions.
diff --git a/bru_common.gypi b/bru_common.gypi
@@ -25,7 +25,6 @@
         # To build config Debug it with msbuild run:
         #   >msbuild *.sln /p:Configuration=Debug
         "default_configuration": "Release",
-
         # List two configs: Debug & Release:
         "configurations": {
             "Debug": {
@@ -68,8 +67,9 @@
                     },
                 },
                 "xcode_settings": {
-                    "GCC_OPTIMIZATION_LEVEL  ": "0", #stop gyp from defaulting to - Os
-		            "CONFIGURATION_BUILD_DIR" : "../../lib/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"
+                    "GCC_OPTIMIZATION_LEVEL  " : "0", #stop gyp from defaulting to - Os
+		            "CONFIGURATION_BUILD_DIR"  : "../../bru_modules/lib/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
+                    "OBJROOT"                  : "bru_build"
                 },
             },
             "Release": {
@@ -123,7 +123,9 @@
                     }
                 },
                 "xcode_settings": {
-		            "CONFIGURATION_BUILD_DIR" : "../../lib/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"
+		            "CONFIGURATION_BUILD_DIR" : "../../bru_modules/lib/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
+                    "OBJROOT"                 : "bru_build"
+
                 },
                 "VCLibrarianTool": {
                     "AdditionalOptions": [

diff --git a/brulib/make.py b/brulib/make.py
@@ -239,15 +239,27 @@ def cmd_make_ios(gyp_filename, config, verbose):
     print("running '{}'".format(xcode_cmdline))
     returncode = os.system(xcode_cmdline)
     if returncode != 0:
-        raise Exception('Build failed: make for simulator returned', returncode)        
-    mkdir_cmdline = 'mkdir lib/{}-Universial'.format(config)
-    returncode = os.system(mkdir_cmdline)
-    filepattern = './lib/{}-iphoneos/lib*.a'.format(config)
-    for file in glob.glob(filepattern):
-    	name = os.path.basename(os.path.normpath(file))
-    	command = 'lipo -create lib/{}-iphoneos/{} lib/{}-iphonesimulator/{} -output lib/{}-Universial/{}'.format(config,name,config,name,config,name)
-    	print("running '{}'".format(command))
-    	returncode = os.system(command)
-    	if returncode != 0:
-    		raise Exception('Build failed: lipo returned', returncode)
+        raise Exception('Build failed: make for simulator returned', returncode)
+    if os.path.exists("./lib"):
+        mkdir_cmdline = 'mkdir lib/{}-Universial'.format(config)
+        returncode = os.system(mkdir_cmdline)
+        filepattern = './lib/{}-iphoneos/lib*.a'.format(config)
+        for file in glob.glob(filepattern):
+            name = os.path.basename(os.path.normpath(file))
+            command = 'lipo -create lib/{}-iphoneos/{} lib/{}-iphonesimulator/{} -output lib/{}-Universial/{}'.format(config,name,config,name,config,name)
+            print("running '{}'".format(command))
+            returncode = os.system(command)
+            if returncode != 0:
+                raise Exception('Build failed: lipo returned', returncode)
+    if os.path.exists("./bru_modules/lib"):
+        mkdir_cmdline = 'mkdir bru_modules/lib/{}-Universial'.format(config)
+        returncode = os.system(mkdir_cmdline)
+        filepattern = './bru_modules/lib/{}-iphoneos/lib*.a'.format(config)
+        for file in glob.glob(filepattern):
+            name = os.path.basename(os.path.normpath(file))
+            command = 'lipo -create bru_modules/lib/{}-iphoneos/{} bru_modules/lib/{}-iphonesimulator/{} -output bru_modules/lib/{}-Universial/{}'.format(config,name,config,name,config,name)
+            print("running '{}'".format(command))
+            returncode = os.system(command)
+            if returncode != 0:
+                raise Exception('Build failed: lipo returned', returncode)
     print('Build complete.')
diff --git a/library/openssl/1.0.1j.bru b/library/openssl/1.0.1j.bru
@@ -15,9 +15,9 @@
     # compile with gyp. WARNING: the gyp file will not necessarily end up using
     # the same options ./configure had configured. TODO: revisit this process.
     "make_command": {
-        "Linux" : "cd openssl-1.0.1j; ./config no-asm no-shared no-ssl2 no-ssl3 no-hw no-zlib no-threads",
+        "Linux" : "cd openssl-1.0.1j; ./config  no-asm no-shared no-ssl2 no-ssl3 no-hw no-zlib no-threads",
         "Darwin": "cd openssl-1.0.1j; ./Configure darwin64-x86_64-cc no-asm no-shared no-ssl2 no-ssl3 no-hw no-zlib no-threads  -Wno-c++11-narrowing -stdlib=libc++ -fvisibility=hidden ",
-        "iOS"   : "cd openssl-1.0.1j; ./Configure iphoneos-cross     no-asm no-shared no-ssl2 no-ssl3 no-hw no-zlib no-threads  -Wno-c++11-narrowing -stdlib=libc++ -fvisibility=hidden",
+        "iOS"   : "cd openssl-1.0.1j; ./Configure iphoneos-cross  no-asm no-shared no-ssl2 no-ssl3 no-hw no-zlib -Wno-c++11-narrowing -stdlib=libc++ -fvisibility=hidden",
         # Why no-asm? Because otherwise you need to install yet another
         # buildtool for compiling openssl (see INSTALL.W32). I'm not sure
         # how much performance we sacrifice by not using asm, hopefully

diff --git a/library/rcf/2.0.1.gyp b/library/rcf/2.0.1.gyp
@@ -30,6 +30,16 @@
                         "WIN32_LEAN_AND_MEAN",
                         "_WIN32_WINNT=0x0500" # >= XP? or win 2000?
                     ]
+                }],
+                ["OS=='mac'", {
+                    "defines": [
+                        "RCF_OPENSSL_STATIC"
+                    ]
+                }],
+                ["OS=='iOS'", {
+                    "defines": [
+                        "RCF_OPENSSL_STATIC"
+                    ]
                 }]
             ],
             "dependencies": [

diff --git a/library/rcf/RCF-2.0.1.101-config.tar.gz b/library/rcf/RCF-2.0.1.101-config.tar.gz