From a6e825464ee0c87f6aed18f18e8deb194eef33ec Mon Sep 17 00:00:00 2001 From: Adam Murdoch Date: Thu, 12 Dec 2013 12:21:44 +1100 Subject: [PATCH] Split the c++ source files into separate source sets for shared, lib and curses --- build.gradle | 16 +-- src/{main => curses}/cpp/curses.cpp | 0 src/{main => shared}/cpp/generic.cpp | 0 src/{main => shared}/cpp/generic_posix.cpp | 0 src/{main => shared}/headers/generic.h | 152 ++++++++++----------- 5 files changed, 84 insertions(+), 84 deletions(-) rename src/{main => curses}/cpp/curses.cpp (100%) rename src/{main => shared}/cpp/generic.cpp (100%) rename src/{main => shared}/cpp/generic_posix.cpp (100%) rename src/{main => shared}/headers/generic.h (96%) diff --git a/build.gradle b/build.gradle index 4a4df25..1a37e11 100755 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,10 @@ allprojects { group = 'net.rubygrapefruit' version = '0.5' + if (!project.hasProperty('release')) { + version = "${version}-dev" + } + sourceCompatibility = 1.5 targetCompatibility = 1.5 @@ -131,18 +135,14 @@ libraries { sources { nativePlatform { cpp { - source.srcDirs = ['src/main/cpp'] - exportedHeaders.srcDirs = ['src/main/headers'] - source.exclude 'curses.cpp' + source.srcDirs = ['src/shared/cpp', 'src/main/cpp'] + exportedHeaders.srcDirs = ['src/shared/headers'] } } nativePlatformCurses { cpp { - source.srcDirs = ['src/main/cpp'] - exportedHeaders.srcDirs = ['src/main/headers'] - source.include 'curses.cpp' - source.include 'generic.cpp' - source.include 'generic_posix.cpp' + source.srcDirs = ['src/shared/cpp', 'src/curses/cpp'] + exportedHeaders.srcDirs = ['src/shared/headers'] } } } diff --git a/src/main/cpp/curses.cpp b/src/curses/cpp/curses.cpp similarity index 100% rename from src/main/cpp/curses.cpp rename to src/curses/cpp/curses.cpp diff --git a/src/main/cpp/generic.cpp b/src/shared/cpp/generic.cpp similarity index 100% rename from src/main/cpp/generic.cpp rename to src/shared/cpp/generic.cpp diff --git a/src/main/cpp/generic_posix.cpp b/src/shared/cpp/generic_posix.cpp similarity index 100% rename from src/main/cpp/generic_posix.cpp rename to src/shared/cpp/generic_posix.cpp diff --git a/src/main/headers/generic.h b/src/shared/headers/generic.h similarity index 96% rename from src/main/headers/generic.h rename to src/shared/headers/generic.h index 4541bb6..bddb711 100755 --- a/src/main/headers/generic.h +++ b/src/shared/headers/generic.h @@ -1,76 +1,76 @@ -/* - * Copyright 2012 Adam Murdoch - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __INCLUDE_GENERIC_H__ -#define __INCLUDE_GENERIC_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define NATIVE_VERSION 17 - -/* - * Marks the given result as failed, using the given error message - */ -extern void mark_failed_with_message(JNIEnv *env, const char* message, jobject result); - -/* - * Marks the given result as failed, using the given error message and the current value of errno/GetLastError() - */ -extern void mark_failed_with_errno(JNIEnv *env, const char* message, jobject result); - -/* - * Marks the given result as failed, using the given error message and error code - */ -extern void mark_failed_with_code(JNIEnv *env, const char* message, int error_code, const char* error_code_message, jobject result); - -/* - * Converts the given Java string to a NULL terminated wchar_str. Should call free() when finished. - * - * Returns NULL on failure. - */ -extern wchar_t* -java_to_wchar(JNIEnv *env, jstring string, jobject result); - -/* - * Converts the given wchar_t string to a Java string. - * - * Returns NULL on failure. - */ -extern jstring wchar_to_java(JNIEnv* env, const wchar_t* chars, size_t len, jobject result); - -/* - * Converts the given Java string to a NULL terminated char string. Should call free() when finished. - * - * Returns NULL on failure. - */ -extern char* java_to_char(JNIEnv *env, jstring string, jobject result); - -/* - * Converts the given NULL terminated char string to a Java string. - * - * Returns NULL on failure. - */ -extern jstring char_to_java(JNIEnv* env, const char* chars, jobject result); - -#ifdef __cplusplus -} -#endif - -#endif +/* + * Copyright 2012 Adam Murdoch + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __INCLUDE_GENERIC_H__ +#define __INCLUDE_GENERIC_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define NATIVE_VERSION 17 + +/* + * Marks the given result as failed, using the given error message + */ +extern void mark_failed_with_message(JNIEnv *env, const char* message, jobject result); + +/* + * Marks the given result as failed, using the given error message and the current value of errno/GetLastError() + */ +extern void mark_failed_with_errno(JNIEnv *env, const char* message, jobject result); + +/* + * Marks the given result as failed, using the given error message and error code + */ +extern void mark_failed_with_code(JNIEnv *env, const char* message, int error_code, const char* error_code_message, jobject result); + +/* + * Converts the given Java string to a NULL terminated wchar_str. Should call free() when finished. + * + * Returns NULL on failure. + */ +extern wchar_t* +java_to_wchar(JNIEnv *env, jstring string, jobject result); + +/* + * Converts the given wchar_t string to a Java string. + * + * Returns NULL on failure. + */ +extern jstring wchar_to_java(JNIEnv* env, const wchar_t* chars, size_t len, jobject result); + +/* + * Converts the given Java string to a NULL terminated char string. Should call free() when finished. + * + * Returns NULL on failure. + */ +extern char* java_to_char(JNIEnv *env, jstring string, jobject result); + +/* + * Converts the given NULL terminated char string to a Java string. + * + * Returns NULL on failure. + */ +extern jstring char_to_java(JNIEnv* env, const char* chars, jobject result); + +#ifdef __cplusplus +} +#endif + +#endif