[Libreoffice-commits] core.git: bin/gbuild-to-ide compile_commands.json osx/jantest osx/janTestLib

[jan Iversen]

 bin/gbuild-to-ide            |    1 +
 compile_commands.json        |    1 +
 osx/janTestLib/janTestLib.h  |   13 -------------
 osx/janTestLib/janTestLib.m  |   13 -------------
 osx/jantest/LibMain.cpp      |   15 ---------------
 osx/jantest/UnittestMain.cpp |   15 ---------------
 6 files changed, 2 insertions(+), 56 deletions(-)

New commits:
commit 8944a4dc98ff4e1028936aa7c287f57183aa9b56
Author: jan Iversen <jani at documentfoundation.org>
Date:   Thu Feb 2 20:27:50 2017 +0100

    gbuild-to-ide added -DLIBO_INTERNAL_ONLY to CXXFLAGS
    
    In order to compile correct this flag is needed and
    it is not exported in the json files
    
    Change-Id: Ib8f0b882f2d59ed467a9198c148263e2882c60b3

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 0ab45d1..7c6d660 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -123,6 +123,7 @@ class GbuildParser:
                     jsondata['target_name'] = module + '_' + jsontype + '_' + match
                     jsondata['DEFS'] = GbuildParser.__split_defs(jsondata['DEFS'])
                     jsondata['LINKED_LIBS'] = jsondata['LINKED_LIBS'].strip().split(' ')
+                    jsondata['CXXFLAGS'] += ' -DLIBO_INTERNAL_ONLY'
                     for i in ['CXXFLAGS', 'CFLAGS', 'OBJCFLAGS', 'OBJCXXFLAGS']:
                         jsondata[i] = GbuildParser.__split_flags(jsondata[i], jsondata[i+'APPEND'])
                     for i in jsonSrc:
diff --git a/compile_commands.json b/compile_commands.json
new file mode 100644
index 0000000..9027ee5
--- /dev/null
+++ b/compile_commands.json
@@ -0,0 +1 @@
+[{"command": "clang++ -Wall -DMACOSX_SDK_VERSION=101200 -DBOOST_ERROR_CODE_HEADER_ONLY -DSAL_LOG_INFO -DSYSTEM_LIBXML -DBOOST_SYSTEM_NO_DEPRECATED -DUNX -DUNIX -D_PTHREADS -DLIBO_INTERNAL_ONLY -DMAC_OS_X_VERSION_MIN_REQUIRED=1080 -DOSL_DEBUG_LEVEL=1 -DX86_64 -DSAL_LOG_WARN -DNO_PTHREAD_PRIORITY -DMAC_OS_X_VERSION_MAX_ALLOWED=101200 -DMACOSX -D_REENTRANT -DCPPU_ENV=gcc3 -I/Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source -Iexternal/boost/include -I/Volumes/LIBREOFFICE/play/xcode/workdir/UnpackedTarball/boost -Il10ntools/inc -Iinclude -I/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/include/darwin -I/Volumes/LIBREOFFICE/play/xcode/config_host -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxml2 -fmessage-length=0 -fno-common -pipe -fno-threadsafe-statics -fvisibility-inlines-hidden -fstack-protector-strong -fPIC -fno-stri
 ct-aliasing -fsigned-char -std=gnu++14 -c /Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source/pocheck.cxx", "directory": "/Volumes/LIBREOFFICE/play/xcode_core/l10ntools", "file": "/Volumes/LIBREOFFICE/play/xcode_core/l10ntools/source/pocheck.cxx"}]
\ No newline at end of file
diff --git a/osx/janTestLib/janTestLib.h b/osx/janTestLib/janTestLib.h
deleted file mode 100644
index ecd1309..0000000
--- a/osx/janTestLib/janTestLib.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  janTestLib.h
-//  janTestLib
-//
-//  Created by Jan Iversen on 29/01/2017.
-//  Copyright © 2017 Jan Iversen. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at interface janTestLib : NSObject
-
- at end
diff --git a/osx/janTestLib/janTestLib.m b/osx/janTestLib/janTestLib.m
deleted file mode 100644
index 365103e..0000000
--- a/osx/janTestLib/janTestLib.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  janTestLib.m
-//  janTestLib
-//
-//  Created by Jan Iversen on 29/01/2017.
-//  Copyright © 2017 Jan Iversen. All rights reserved.
-//
-
-#import "janTestLib.h"
-
- at implementation janTestLib
-
- at end
diff --git a/osx/jantest/LibMain.cpp b/osx/jantest/LibMain.cpp
deleted file mode 100644
index 20a59c3..0000000
--- a/osx/jantest/LibMain.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  main.cpp
-//  jantest
-//
-//  Created by Jan Iversen on 29/01/2017.
-//  Copyright © 2017 Jan Iversen. All rights reserved.
-//
-
-#include <iostream>
-
-int main(int argc, const char * argv[]) {
-    // insert code here...
-    std::cout << "Hello, World!\n";
-    return 0;
-}
diff --git a/osx/jantest/UnittestMain.cpp b/osx/jantest/UnittestMain.cpp
deleted file mode 100644
index 20a59c3..0000000
--- a/osx/jantest/UnittestMain.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  main.cpp
-//  jantest
-//
-//  Created by Jan Iversen on 29/01/2017.
-//  Copyright © 2017 Jan Iversen. All rights reserved.
-//
-
-#include <iostream>
-
-int main(int argc, const char * argv[]) {
-    // insert code here...
-    std::cout << "Hello, World!\n";
-    return 0;
-}