Skip to content
Permalink
Browse files

Problem: New zyre-jni structure not added

Solution: Adjust the root path gitignore rules to only igonre distcheck
workspace and archives.
  • Loading branch information
sappo committed Feb 14, 2020
1 parent f606b73 commit 7464ecc9c11603b459ce051046bbf050713eca32
@@ -34,9 +34,9 @@ src/zyre_selftest
core

# Distcheck workspace and archives
zyre-*/
zyre-*.tar.gz
zyre-*.zip
/zyre-*/
/zyre-*.tar.gz
/zyre-*.zip

# Man pages
doc/*.1
@@ -0,0 +1,72 @@
/*
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
*/

dependencies {
compile project(':zyre-jni')
runtimeOnly "org.zeromq.zyre:zyre-jni-linux-x86_64:${project.version}"
runtimeOnly "org.zeromq.zyre:zyre-jni-osx-x86_64:${project.version}"
runtimeOnly "org.zeromq.zyre:zyre-jni-windows-x86_64:${project.version}"
compile 'org.zeromq.czmq:czmq-jni:latest.release'
runtimeOnly 'org.zeromq.czmq:czmq-jni-all:latest.release'
}

// ------------------------------------------------------------------
// Install and Publish section

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
artifactId = 'zyre-jni-all'
pom {
name = 'zyre-jni-all'
description = 'an open-source framework for proximity-based P2P apps'
packaging = 'jar'
url = 'https://github.com/zeromq/zyre'
licenses {
license {
name = 'Mozilla Public License Version 2.0'
url = 'https://www.mozilla.org/en-US/MPL/2.0/'
}
}
scm {
connection = 'https://github.com/zeromq/zyre.git'
developerConnection = 'https://github.com/zeromq/zyre.git'
url = 'https://github.com/zeromq/zyre'
}
}
}
}
}

artifactoryPublish {
publications ('mavenJava')
}


bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_KEY')
publications = ['mavenJava']
publish = true
override = true
pkg {
repo = 'maven'
name = 'zyre-jni-all'
desc = 'an open-source framework for proximity-based P2P apps'
userOrg = System.getenv('BINTRAY_USER_ORG')
licenses = ['MPL-2.0']
websiteUrl = 'https://github.com/zeromq/zyre'
issueTrackerUrl = 'https://github.com/zeromq/zyre/issues'
vcsUrl = 'https://github.com/zeromq/zyre.git'
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
version {
name = project.version
vcsTag= project.version
}
}
}
@@ -0,0 +1,114 @@
/*
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
*/

dependencies {
compile project(':zyre-jni')
runtimeOnly "org.zeromq.czmq:czmq-jni-${osdetector.classifier}:latest.release"
}

// ------------------------------------------------------------------
// Build section

task copyLibs(type: Copy) {
def libraryPaths = System.getProperty('java.library.path').split(File.pathSeparator).toList()
libraryPaths.add('/usr/local/lib')
libraryPaths.add("${rootDir}/zyre-jni")
libraryPaths.add("${rootDir}/zyre-jni/build/Release")

libraryPaths.each { path ->
from path
include 'libzyrejni.so'
include 'libzyrejni.dylib'
include '*zyrejni*.dll'
include 'libzyre.so'
include 'libzyre.dylib'
include '*zyre*.dll'
include 'libzmq.so'
include 'libzmq.dylib'
include '*zmq*.dll'
include 'libczmq.so'
include 'libczmq.dylib'
include '*czmq*.dll'
into 'build/natives'
}
}

jar.baseName = "zyre-jni-${osdetector.classifier}"
jar.dependsOn copyLibs

jar {
def arch = osdetector.arch.contains('64') ? '64' : '32'
from 'build/natives'
include '*'
into "natives/${osdetector.os}_${arch}"
}

// ------------------------------------------------------------------
// Install and Publish section

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
artifactId = "zyre-jni-${osdetector.classifier}"
pom {
name = "zyre-jni-${osdetector.classifier}"
description = 'an open-source framework for proximity-based P2P apps'
packaging = 'jar'
url = 'https://github.com/zeromq/zyre'
licenses {
license {
name = 'Mozilla Public License Version 2.0'
url = 'https://www.mozilla.org/en-US/MPL/2.0/'
}
}
scm {
connection = 'https://github.com/zeromq/zyre.git'
developerConnection = 'https://github.com/zeromq/zyre.git'
url = 'https://github.com/zeromq/zyre'
}
}
}
}
}

artifactoryPublish {
publications ('mavenJava')
}

bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_KEY')
publications = ['mavenJava']
publish = true
override = true
pkg {
repo = 'maven'
name = "zyre-jni-${osdetector.classifier}"
desc = 'an open-source framework for proximity-based P2P apps'
userOrg = System.getenv('BINTRAY_USER_ORG')
licenses = ['MPL-2.0']
websiteUrl = 'https://github.com/zeromq/zyre'
issueTrackerUrl = 'https://github.com/zeromq/zyre/issues'
vcsUrl = 'https://github.com/zeromq/zyre.git'
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
version {
name = project.version
vcsTag= project.version
}
}
}

// ------------------------------------------------------------------
// Cleanup section

clean.doFirst {
delete fileTree(projectDir) {
include '*.so'
include '*.dylib'
}
}
@@ -0,0 +1,66 @@
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
cmake_minimum_required (VERSION 2.8)

project (zyrejni CXX)
enable_language (C)

# Search for Find*.cmake files in the following locations
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../..")

########################################################################
# JNI dependency
########################################################################
find_package (JNI REQUIRED)
include_directories (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} src/native/include)

########################################################################
# LIBZMQ dependency
########################################################################
find_package(libzmq REQUIRED)
IF (LIBZMQ_FOUND)
include_directories(${LIBZMQ_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${LIBZMQ_LIBRARIES})
ELSE (LIBZMQ_FOUND)
message( FATAL_ERROR "libzmq not found." )
ENDIF (LIBZMQ_FOUND)

########################################################################
# CZMQ dependency
########################################################################
find_package(czmq REQUIRED)
IF (CZMQ_FOUND)
include_directories(${CZMQ_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
ELSE (CZMQ_FOUND)
message( FATAL_ERROR "czmq not found." )
ENDIF (CZMQ_FOUND)

########################################################################
# ZYRE dependency
########################################################################
find_package(zyre REQUIRED)
IF (ZYRE_FOUND)
include_directories(${ZYRE_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${ZYRE_LIBRARIES})
ELSE (ZYRE_FOUND)
message( FATAL_ERROR "zyre not found." )
ENDIF (ZYRE_FOUND)

set (zyrejni_sources
src/main/c/org_zeromq_zyre_Zyre.c
src/main/c/org_zeromq_zyre_ZyreEvent.c
)

add_library (zyrejni SHARED ${zyrejni_sources})
add_definitions (-DZYRE_BUILD_DRAFT_API)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -O2")
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)

target_link_libraries (zyrejni ${MORE_LIBRARIES})
@@ -0,0 +1,47 @@
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################

if (NOT MSVC)
include(FindPkgConfig)
pkg_check_modules(PC_ZYRE "libzyre")
if (NOT PC_ZYRE_FOUND)
pkg_check_modules(PC_ZYRE "libzyre")
endif (NOT PC_ZYRE_FOUND)
if (PC_ZYRE_FOUND)
# some libraries install the headers is a subdirectory of the include dir
# returned by pkg-config, so use a wildcard match to improve chances of finding
# headers and SOs.
set(PC_ZYRE_INCLUDE_HINTS ${PC_ZYRE_INCLUDE_DIRS} ${PC_ZYRE_INCLUDE_DIRS}/*)
set(PC_ZYRE_LIBRARY_HINTS ${PC_ZYRE_LIBRARY_DIRS} ${PC_ZYRE_LIBRARY_DIRS}/*)
endif(PC_ZYRE_FOUND)
endif (NOT MSVC)

find_path (
ZYRE_INCLUDE_DIRS
NAMES zyre.h
HINTS ${PC_ZYRE_INCLUDE_HINTS}
)

find_library (
ZYRE_LIBRARIES
NAMES zyre
HINTS ${PC_ZYRE_LIBRARY_HINTS}
)

include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(
ZYRE
REQUIRED_VARS ZYRE_LIBRARIES ZYRE_INCLUDE_DIRS
)
mark_as_advanced(
ZYRE_FOUND
ZYRE_LIBRARIES ZYRE_INCLUDE_DIRS
)

################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
@@ -0,0 +1,62 @@
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
cmake_minimum_required (VERSION 3.6)

project (zyrejni CXX)
enable_language (C)

# Search for Find*.cmake files in the following locations
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../..")

########################################################################
# LIBZMQ dependency
########################################################################
find_package(libzmq REQUIRED)
IF (LIBZMQ_FOUND)
include_directories(${LIBZMQ_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${LIBZMQ_LIBRARIES})
ELSE (LIBZMQ_FOUND)
message( FATAL_ERROR "libzmq not found." )
ENDIF (LIBZMQ_FOUND)

########################################################################
# CZMQ dependency
########################################################################
find_package(czmq REQUIRED)
IF (CZMQ_FOUND)
include_directories(${CZMQ_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
ELSE (CZMQ_FOUND)
message( FATAL_ERROR "czmq not found." )
ENDIF (CZMQ_FOUND)

########################################################################
# ZYRE dependency
########################################################################
find_package(zyre REQUIRED)
IF (ZYRE_FOUND)
include_directories(${ZYRE_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${ZYRE_LIBRARIES})
ELSE (ZYRE_FOUND)
message( FATAL_ERROR "zyre not found." )
ENDIF (ZYRE_FOUND)

include_directories(../src/native/include)

set (zyrejni_sources
../src/main/c/org_zeromq_zyre_Zyre.c
../src/main/c/org_zeromq_zyre_ZyreEvent.c
)

add_library (zyrejni SHARED ${zyrejni_sources})
add_definitions (-DZYRE_BUILD_DRAFT_API)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -O2")
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build)

target_link_libraries (zyrejni ${MORE_LIBRARIES})

0 comments on commit 7464ecc

Please sign in to comment.
You can’t perform that action at this time.