adding ValenciaPlugin

Author: jstrube

.ci/build_tarballs.jl

@@ -1,28 +1,32 @@
 # Note that this script can accept some limited command-line arguments, run
 # `julia build_tarballs.jl --help` to see a usage message.
 using BinaryBuilder
+using Pkg
 
 name = "FastJet_Julia_Wrapper"
-version_number = get(ENV, "TRAVIS_TAG", "")
-if version_number == ""
-    version_number = "v0.99"
-end
-version = VersionNumber(version_number)
+version = v"0.7.0"
 
 # Collection of sources required to build Fjwbuilder
 sources = [
-	"FastJet_Julia_Wrapper",
+	DirectorySource("FastJet_Julia_Wrapper"),
 	ArchiveSource("https://julialang-s3.julialang.org/bin/linux/x64/1.3/julia-1.3.1-linux-x86_64.tar.gz", "faa707c8343780a6fe5eaf13490355e8190acf8e2c189b9e7ecbddb0fa2643ad"; unpack_target="julia-x86_64-linux-gnu"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
-Julia_PREFIX=${WORKSPACE}/srcdir/julia-$target/julia-1.3.1
+case "$target" in
+	arm-linux-gnueabihf|x86_64-linux-gnu)
+        Julia_PREFIX=${WORKSPACE}/srcdir/julia-$target/julia-1.3.1
+        ;;
+    x86_64-apple-darwin14|x86_64-w64-mingw32)
+        Julia_PREFIX=${WORKSPACE}/srcdir/julia-$target/juliabin
+        ;;
+esac
 cd ${WORKSPACE}/srcdir
 mkdir build && cd build
-export JlCxx_DIR=${prefix}
 cmake -DJulia_PREFIX=${Julia_PREFIX} -DCMAKE_INSTALL_PREFIX=${prefix} -DCMAKE_FIND_ROOT_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release ..
 VERBOSE=ON cmake --build . --config Release --target install
+install_license $WORKSPACE/srcdir/LICENSE.md
 """
 
 # These are the platforms we will build for by default, unless further
@@ -41,7 +45,8 @@ products = [
 dependencies = [
 	Dependency("libcxxwrap_julia_jll"),
 	Dependency("FastJet_jll")
+	# Dependency(PackageSpec(;name="FastJet_jll", url="https://github.com/jstrube/FastJet_jll.jl"))
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"8")
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"9")

CMakeLists.txt

@@ -23,7 +23,7 @@ include(InstallRequiredSystemLibraries)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder")
 endif()
-#set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
 add_definitions(-DJULIA_ENABLE_THREADING)
 # JlCxx_DIR needs to be passed in with -D
 find_package(JlCxx REQUIRED )
@@ -44,7 +44,7 @@ link_directories(${CMAKE_INSTALL_PREFIX}/lib lib)
 ######################################################
 # add_library(fjcore SHARED src/fjcore)
 add_library(fastjetwrap SHARED src/fastJetWrap.cc)
-target_link_libraries(fastjetwrap JlCxx::cxxwrap_julia JlCxx::cxxwrap_julia_stl fastjet)
+target_link_libraries(fastjetwrap JlCxx::cxxwrap_julia JlCxx::cxxwrap_julia_stl fastjet ValenciaPlugin)
 install(TARGETS
   fastjetwrap
 LIBRARY DESTINATION lib${LIBDIR_SUFFIX}

src/fastJetWrap.cc

@@ -2,7 +2,7 @@
 #include "jlcxx/stl.hpp"
 
 #include "fastjet/ClusterSequence.hh"
-// #include "fjcore.hh"
+#include "fastjet/ValenciaPlugin.hh"
 #include <vector>
 
 using namespace std;
@@ -106,6 +106,16 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& fastjet)
     fastjet.add_type<JetDefinition>("JetDefinition")
     .constructor<const JetAlgorithm, double>();
 
+    fastjet.add_type<JetDefinition::Plugin>("JetDefinitionPlugin");
+
+    fastjet.add_type<contrib::ValenciaPlugin>("ValenciaPlugin", jlcxx::julia_base_type<JetDefinition::Plugin>())
+    .constructor<double, double>()
+    .constructor<double, double, double>();
+
+    fastjet.method("JetDefinition", [](const JetDefinition::Plugin* p) {
+        return JetDefinition(p);
+    });
+
     fastjet.method("constituents", [](const PseudoJet& pj) {
 		return pj.constituents();
 	});