diff --git a/.gitignore b/.gitignore index 598d5af..9444930 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ site # Gradle Files # .gradle gradle.properties +build.gradle.private # Eclipse Files # .settings diff --git a/build.gradle b/build.gradle index 2adf252..942a7c2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'maven' -apply plugin: 'signing' group = 'com.fazecast.jSerialComm' archivesBaseName = 'jSerialComm' @@ -10,7 +9,6 @@ version = '1.0.0' sourceCompatibility = 1.6 targetCompatibility = 1.6 javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/") -//compileJava.options.bootClasspath = "C:/Program Files/Java/jre6/lib/rt.jar" jar { manifest { @@ -47,53 +45,3 @@ task sourcesJar(type: Jar) { artifacts { archives jar, javadocJar, sourcesJar, testJar } - -signing { - sign configurations.archives -} - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name 'jSerialComm' - artifactId 'jSerialComm' - packaging 'jar' - version version - description 'A platform-independent serial communications library for Java.' - url 'http://fazecast.github.io/jSerialComm/' - - scm { - connection 'scm:git:https://github.com/Fazecast/jSerialComm.git' - developerConnection 'scm:git:https://github.com/Fazecast/jSerialComm.git' - url 'https://github.com/Fazecast/jSerialComm' - } - - licenses { - license { - name 'GNU Lesser GPL, Version 3' - url 'http://www.gnu.org/licenses/lgpl.html' - } - } - - developers { - developer { - id 'hedgecrw85' - name 'Will Hedgecock' - email 'will.hedgecock@fazecast.com' - } - } - } - } - } -} diff --git a/src/main/cpp/OSX/Makefile b/src/main/cpp/OSX/Makefile index ee44b6e..dc3becd 100644 --- a/src/main/cpp/OSX/Makefile +++ b/src/main/cpp/OSX/Makefile @@ -32,7 +32,7 @@ JAVA_CLASS = $(JAVA_CLASS_DIR)/SerialPort.class # Default build target builds both 32 and 64 bit libraries all : osx32 osx64 - $(DELETE) -rf `readlink -f $(BUILD_DIR)/..` + $(DELETE) -rf $(BUILD_DIR) $(DELETE) -rf ../*.h # Builds 32-bit OSX libraries diff --git a/src/main/resources/OSX/x86/libjSerialComm.jnilib b/src/main/resources/OSX/x86/libjSerialComm.jnilib new file mode 100644 index 0000000..c212751 Binary files /dev/null and b/src/main/resources/OSX/x86/libjSerialComm.jnilib differ diff --git a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib new file mode 100644 index 0000000..d2d737a Binary files /dev/null and b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib differ