Forwarding this message to the [email protected] distribution
list.
On Mon, Jul 16, 2018 at 8:38 AM, Ignacio Ocampo <[email protected]> wrote:
> Hi Seokhee,
>
> I just read the Project Governance, and it seems the question I have is
> more related to the *Platform Support* project.
>
> I saw Mac OS was supported but not anymore, I modified several SCons
> scripts (I didn't modify not code at all), to support Mac OS again.
>
> Please find attached the patch (git diff > patchForMacOSX.txt) I created
> with the changes, it is based on the 1.3.1 branch.
>
> I saw also it was supported for iOS, and despite the SCons changes I made
> could ve very similar for iOS, I didn't changed neither tested anything for
> iOS yet.
>
> I tested the following in Mac OSX (10.12.6):
>
>
> - scons SECURED=1 RELEASE=true BUILD_JAVA=true
> JAVA_HOME=`/usr/libexec/java_home -v 1.8` -j 8
> - scons SECURED=0 RELEASE=true BUILD_JAVA=true
> JAVA_HOME=`/usr/libexec/java_home -v 1.8` -j 8
> - scons SECURED=1 RELEASE=false BUILD_JAVA=true
> JAVA_HOME=`/usr/libexec/java_home -v 1.8` -j 8
> - scons SECURED=0 RELEASE=false BUILD_JAVA=true
> JAVA_HOME=`/usr/libexec/java_home -v 1.8` -j 8
> - I executed examples in C, with and without security.
> - I executed examples with Java (JNI).
>
> Could we review/discuss this changes?
>
> Regards
>
> On Sat, Jul 14, 2018 at 11:23 PM, Ignacio Ocampo <[email protected]> wrote:
>
>> Hi all,
>>
>> I spent the last week fixing scons scripts to make it available for Mac
>> OS X, and it's working!
>>
>> Well, almost there, I just saw the different scenarios you considering (
>> https://wiki.iotivity.org/jenkins_builders) and I should test that I'm
>> won't broke anything.
>>
>> Is there anyone else working with Mac OS already? I would like to
>> collaborate on this.
>>
>> Regards
>>
>> --
>> Ignacio Ocampo
>>
>>
>
>
> --
> Ignacio Ocampo
>
>
--
Ignacio Ocampo
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9775):
https://lists.iotivity.org/g/iotivity-dev/message/9775
Mute This Topic: https://lists.iotivity.org/mt/23534908/21656
Group Owner: [email protected]
Unsubscribe: https://lists.iotivity.org/g/iotivity-dev/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/build_common/darwin/SConscript b/build_common/darwin/SConscript
index ab65efc52..84f1ecb07 100644
--- a/build_common/darwin/SConscript
+++ b/build_common/darwin/SConscript
@@ -104,6 +104,7 @@ elif sys_version not in sdks:
sys_version = maxsdk
env['SYS_VERSION'] = sys_version # for the benefit of ../ios/SConscript
+env.AppendUnique(CCFLAGS=['-Wno-unused-private-field'])
if env.get('RELEASE'):
env.AppendUnique(CCFLAGS=['-Os'])
else:
diff --git a/java/jni/SConscript b/java/jni/SConscript
index 57bee1ac5..315ce0a61 100644
--- a/java/jni/SConscript
+++ b/java/jni/SConscript
@@ -87,7 +87,7 @@ else:
# - Disabled due to compiler incorrectly specifying JNI functions as
# unreferenced
jni_env.AppendUnique(CCFLAGS=['/wd4047', '/wd4022', '/wd4505',])
-jni_env.AppendUnique(LIBPATH=['#/exlibs/sqlite3'])
+jni_env.AppendUnique(LIBPATH=['#/extlibs/sqlite3'])
jni_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
jni_env.PrependUnique(LIBS=[
'resource_directory',
diff --git a/resource/SConscript b/resource/SConscript
index 3ec59999c..41a7262bd 100644
--- a/resource/SConscript
+++ b/resource/SConscript
@@ -39,7 +39,7 @@ SConscript('#extlibs/libcoap/SConscript')
# Build csdk
SConscript('csdk/SConscript')
-if target_os not in ['arduino', 'darwin', 'ios']:
+if target_os not in ['arduino', 'ios']:
# Build liboc_logger
SConscript('oc_logger/SConscript')
@@ -50,7 +50,7 @@ if target_os in ['windows', 'linux']:
# Build IoTivity Procedural Client API
SConscript('IPCA/SConscript')
-if target_os not in ['arduino','darwin','ios','android']:
+if target_os not in ['arduino', 'ios', 'android']:
# Build examples
SConscript('examples/SConscript')
diff --git a/resource/csdk/resource-directory/SConscript
b/resource/csdk/resource-directory/SConscript
index f28a5f3db..59f90879f 100644
--- a/resource/csdk/resource-directory/SConscript
+++ b/resource/csdk/resource-directory/SConscript
@@ -95,7 +95,7 @@ if 'CLIENT' in rd_mode:
rd_src_all = rd_src_c
-if target_os not in ['arduino', 'darwin', 'ios']:
+if target_os not in ['arduino', 'ios']:
rd_src_cpp += [RD_SRC_DIR + 'RDClient.cpp']
if 'CLIENT' in rd_mode:
rd_src_all += rd_src_cpp
diff --git a/resource/csdk/security/SConscript
b/resource/csdk/security/SConscript
index 2daa1aea4..d6f73bf21 100644
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -62,7 +62,7 @@ if target_os in ['windows', 'msys_nt']:
libocsrm_env.AppendUnique(CCFLAGS=['/W4'])
if libocsrm_env.get('SECURED') == '1':
- if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows']:
+ if target_os in ['linux', 'android', 'darwin', 'tizen', 'msys_nt',
'windows']:
SConscript('provisioning/SConscript', 'libocsrm_env')
if target_os in ['linux', 'windows', 'darwin']:
diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript
index e027f27b6..07c877e5c 100644
--- a/resource/csdk/stack/SConscript
+++ b/resource/csdk/stack/SConscript
@@ -104,7 +104,7 @@ if env.get('SECURED') == '1':
# c_common calls into mbedcrypto.
liboctbstack_env.AppendUnique(LIBS=['mbedcrypto'])
-if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']:
+if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows', 'darwin']:
if target_os not in ['windows', 'msys_nt']:
liboctbstack_env.PrependUnique(LIBS=['connectivity_abstraction'])
else:
@@ -198,7 +198,7 @@ elif target_os not in ['darwin', 'ios', 'msys_nt',
'windows']:
if target_os in ['darwin', 'ios']:
env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
liboctbstack_env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
-if target_os not in ['arduino', 'windows']:
+if target_os not in ['arduino', 'darwin', 'windows']:
liboctbstack_env.AppendUnique(LINKFLAGS=['-Wl,--no-undefined'])
if target_os == 'android':
liboctbstack_env.AppendUnique(LINKFLAGS=['-Wl,-soname,liboctbstack.so'])
@@ -260,7 +260,7 @@ internal_liboctbstack = liboctbstack_env.StaticLibrary(
'octbstack_internal', liboctbstack_src)
octbstack_libs = Flatten(internal_liboctbstack)
-if target_os not in ['arduino', 'darwin', 'ios']:
+if target_os not in ['arduino', 'ios']:
shared_liboctbstack = liboctbstack_env.SharedLibrary(
'octbstack', liboctbstack_src)
octbstack_libs += Flatten(shared_liboctbstack)
diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index f0a6f092e..42d7276e5 100644
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -79,8 +79,10 @@ if target_os in ['linux', 'tizen']:
if target_os in ['darwin', 'ios']:
ocprovision_env.AppendUnique(LIBS=[
+ 'oc',
'octbstack',
- 'oc_logger'
+ 'oc_logger',
+ 'ocpmapi'
])
if target_os in ['windows']:
diff --git a/resource/src/SConscript b/resource/src/SConscript
index e5d63669d..5a747267b 100644
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -197,5 +197,5 @@ if with_cloud:
header_dir + 'OCAccountManager.h', 'resource', 'OCAccountManager.h')
# Add Provisioning library
-if target_os in ['linux', 'android', 'tizen', 'ios', 'windows'] and secured ==
'1':
+if target_os in ['linux', 'android', 'tizen', 'darwin', 'ios', 'windows'] and
secured == '1':
SConscript('../provisioning/SConscript')
