Merge branch 'master' into merge-upstream

Author: kornilova203

.travis.yml

@@ -5,7 +5,7 @@ compiler: gcc
 script:
  - docker-compose build ubuntu-16.04-llvm-$LLVM_VERSION
  - docker run --rm -ti scala-native-bindgen:ubuntu-16.04-llvm-$LLVM_VERSION /usr/include/ctype.h -name ctype --
- - docker run --rm -ti scala-native-bindgen:ubuntu-16.04-llvm-$LLVM_VERSION
+ - docker run --rm -ti --entrypoint /src/target/scalaBindgenTest scala-native-bindgen:ubuntu-16.04-llvm-$LLVM_VERSION
 
 matrix:
   include:

CMakeLists.txt

@@ -11,8 +11,8 @@ add_definitions(${LLVM_DEFINITIONS})
 
 add_compile_options(-fexceptions -std=c++11)
 
-add_executable(scalaBindgen
-  Main.cpp
+add_library(scalaNativeBindgen
+  STATIC
   ScalaFrontend.h
   TreeVisitor.h
   TreeVisitor.cpp
@@ -23,12 +23,27 @@ add_executable(scalaBindgen
   HeaderManager.cpp
   CycleDetection.h
   Utils.h
-  catch/catch.hpp
-  SimpleTypeTests.cpp
+  )
+
+add_executable(scalaBindgen
+  Main.cpp
   )
 
 target_link_libraries(scalaBindgen
   PRIVATE
+  scalaNativeBindgen
+  clangFrontend
+  clangTooling
+  )
+
+add_executable(scalaBindgenTest
+  SimpleTypeTests.cpp
+  catch/catch.hpp
+  )
+
+target_link_libraries(scalaBindgenTest
+  PRIVATE
+  scalaNativeBindgen
   clangFrontend
   clangTooling
   )

LICENCE.txt

@@ -0,0 +1,27 @@
+Copyright (c) 2015-2018 EPFL
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of the EPFL nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.txt

@@ -1,8 +1,6 @@
 #include "ScalaFrontend.h"
 #include "Utils.h"
 
-#define CATCH_CONFIG_RUNNER
-#include "catch/catch.hpp"
 
 static llvm::cl::OptionCategory Category("Binding Generator");
 static llvm::cl::extrahelp CommonHelp(clang::tooling::CommonOptionsParser::HelpMessage);
@@ -13,72 +11,63 @@ static llvm::cl::opt<bool> PrintHeadersLocation ("location", llvm::cl::cat(Categ
 
 
 int main(int argc, char *argv[]) {
+    clang::tooling::CommonOptionsParser op(argc, (const char**)argv, Category);
+    clang::tooling::ClangTool Tool(op.getCompilations(), op.getSourcePathList());
 
-    if(argc <= 1 ){
+    auto lib = LibName.getValue();
+    if(lib == ""){
+        llvm::errs() << "Error: Please specify the lib name using -name paramter\n";
+        return -1;
+    }
 
-        int result = Catch::Session().run( argc, argv );
-        return result;
+    auto stdhead = StdHeaders.getValue();
+    if(stdhead != ""){
+        headerMan.LoadConfig(stdhead);
+    }
 
-    } else{
+    declarations = "";
+    enums = "";
+    helpers = "";
+    locations.clear();
 
-        clang::tooling::CommonOptionsParser op(argc, (const char**)argv, Category);
-        clang::tooling::ClangTool Tool(op.getCompilations(), op.getSourcePathList());
+    int result = Tool.run(clang::tooling::newFrontendActionFactory<ScalaFrontendAction>().get());
 
-        auto lib = LibName.getValue();
-        if(lib == ""){
-            llvm::errs() << "Error: Please specify the lib name using -name paramter\n";
-            return -1;
-        }
+    auto printLoc = PrintHeadersLocation.getValue();
 
-        auto stdhead = StdHeaders.getValue();
-        if(stdhead != ""){
-            headerMan.LoadConfig(stdhead);
+    if(printLoc){
+        for(const auto& location: locations){
+            llvm::outs() << location;
         }
 
-        declarations = "";
-        enums = "";
-        helpers = "";
-        locations.clear();
-
-        int result = Tool.run(clang::tooling::newFrontendActionFactory<ScalaFrontendAction>().get());
-
-        auto printLoc = PrintHeadersLocation.getValue();
-
-        if(printLoc){
-            for(const auto& location: locations){
-                llvm::outs() << location;
-            }
-
-        } else {
-            if(declarations != "" || enums != "")
-            llvm::outs() << "import scala.scalanative._\n"
-                         << "import scala.scalanative.native._\n"
-                         << "import scala.scalanative.native.Nat._\n\n";
-
-            if(declarations != ""){
-                llvm::outs() << "@native.link(\"" << lib << "\")\n"
-                             << "@native.extern\n"
-                             << "object " << lib << " {\n"
-                             << declarations
-                             << "}\n\n";
-            }
+    } else {
+        if(declarations != "" || enums != "")
+        llvm::outs() << "import scala.scalanative._\n"
+                     << "import scala.scalanative.native._\n"
+                     << "import scala.scalanative.native.Nat._\n\n";
+
+        if(declarations != ""){
+            llvm::outs() << "@native.link(\"" << lib << "\")\n"
+                         << "@native.extern\n"
+                         << "object " << lib << " {\n"
+                         << declarations
+                         << "}\n\n";
+        }
 
-            if(enums != "" || helpers != ""){
-                llvm::outs() << "import " + lib + "._\n\n";
-            }
+        if(enums != "" || helpers != ""){
+            llvm::outs() << "import " + lib + "._\n\n";
+        }
 
-            if(enums != ""){
-                llvm::outs() << "object " << lib << "Enums {\n"
-                             << enums
-                             << "}\n\n";
-            }
+        if(enums != ""){
+            llvm::outs() << "object " << lib << "Enums {\n"
+                         << enums
+                         << "}\n\n";
+        }
 
-            if(helpers != ""){
-                llvm::outs() << "object " << lib << "Helpers {\n"
-                             << helpers
-                             << "}\n\n";
-            }
+        if(helpers != ""){
+            llvm::outs() << "object " << lib << "Helpers {\n"
+                         << helpers
+                         << "}\n\n";
         }
-        return result;
     }
+    return result;
 }

Main.cpp

@@ -1,6 +1,8 @@
 # Scala Native Binding generator
 
-This tool generate Scala Native bindings from C headers. It's build upon clang and Libtooling and thus respect the conventions of clang-tools.
+[![Build Status](https://travis-ci.com/kornilova-l/scala-native-bindgen.svg?branch=master)](https://travis-ci.com/kornilova-l/scala-native-bindgen)
+
+This tool generate Scala Native bindings from C headers. It's built upon clang and Libtooling and thus respect the conventions of clang-tools.
 
 ## Usage
 
@@ -26,3 +28,8 @@ cmake ..
 make
 ./scalaBindgen /usr/include/ctype.h -name ctype
 ```
+
+## License
+
+This project is distributed under the Scala license.
+[See LICENSE.txt for details](LICENSE.txt)

README.md

@@ -1,10 +1,17 @@
 #include "ScalaFrontend.h"
 
 #include "clang/Tooling/Tooling.h"
+
+#define CATCH_CONFIG_RUNNER
 #include "catch/catch.hpp"
 
 #include <iostream>
 
+int main(int argc, char *argv[]) {
+    int result = Catch::Session().run( argc, argv );
+    return result;
+}
+
 std::string Translate(std::string code){
     declarations = "";
     enums = "";