From 0ddedab9c6185028661dcaaac9f6fbca4c9e93fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 18:27:29 +0000 Subject: work in progress cmake commit: - cmake now builds all files that automake does but does NOT link yet - inlcudes nasty hard coded paths and libs (will replace once linking works) (bzr r10272) --- src/bind/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index a6b5b6883..08b7876c2 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,7 +1,6 @@ -SET(bind_SRC -dobinding.cpp -javabind.cpp +set(bind_SRC + dobinding.cpp + javabind.cpp ) -ADD_LIBRARY(bind STATIC ${bind_SRC}) -TARGET_LINK_LIBRARIES(bind -${INKSCAPE_LIBS}) \ No newline at end of file +add_library(bind STATIC ${bind_SRC}) +target_link_libraries(bind ${INKSCAPE_LIBS}) -- cgit v1.2.3 From de03354959190a2c5392d79e03dd22dc45777e41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 21:27:00 +0000 Subject: cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs. (bzr r10274) --- src/bind/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 08b7876c2..71bf0b602 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -2,5 +2,5 @@ set(bind_SRC dobinding.cpp javabind.cpp ) -add_library(bind STATIC ${bind_SRC}) -target_link_libraries(bind ${INKSCAPE_LIBS}) +add_library(bind_LIB STATIC ${bind_SRC}) +target_link_libraries(bind_LIB ${INKSCAPE_LIBS}) -- cgit v1.2.3 From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 00:19:17 +0000 Subject: cmake: turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276) --- src/bind/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 71bf0b602..d0f7c7ca0 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,6 +1,7 @@ + set(bind_SRC dobinding.cpp javabind.cpp ) -add_library(bind_LIB STATIC ${bind_SRC}) -target_link_libraries(bind_LIB ${INKSCAPE_LIBS}) + +add_library(bind_LIB ${bind_SRC}) -- cgit v1.2.3 From 2c5f1ac093f8d674dae8fc1cae88862d02468356 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 02:33:03 +0000 Subject: cmake: now builds without having most of the source listed in 1 file. (bzr r10278) --- src/bind/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index d0f7c7ca0..8a98e20a3 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -4,4 +4,5 @@ set(bind_SRC javabind.cpp ) -add_library(bind_LIB ${bind_SRC}) +# add_library(bind_LIB ${bind_SRC}) +add_inkscape_source("${bind_SRC}") -- cgit v1.2.3 From b7a4f23ed217a36eaaefe8f707bcc1b968d1e562 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 05:39:42 +0000 Subject: cmake: - group source/headers per library (for some IDE's) - include headers with source listing (also for IDE's) - remove unneeded Find modules (bzr r10281) --- src/bind/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 8a98e20a3..9b6abad4f 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -2,7 +2,17 @@ set(bind_SRC dobinding.cpp javabind.cpp + + + # ------- + # Headers + javabind-private.h + javabind.h + javainc/jni.h + javainc/linux/jni_md.h + javainc/solaris/jni_md.h + javainc/win32/jni_md.h ) -# add_library(bind_LIB ${bind_SRC}) +# add_inkscape_lib(bind_LIB "${bind_SRC}") add_inkscape_source("${bind_SRC}") -- cgit v1.2.3 From 6343a24c5cd0a998e00ae05fc6abe2081be21c71 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Mon, 3 Oct 2011 00:24:15 -0700 Subject: Doxygen cleanup. (bzr r10660) --- src/bind/dobinding.cpp | 2 +- src/bind/javabind.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/dobinding.cpp b/src/bind/dobinding.cpp index 1ba708ed7..284565e92 100644 --- a/src/bind/dobinding.cpp +++ b/src/bind/dobinding.cpp @@ -1,6 +1,6 @@ /** * @file - * @brief This is a simple mechanism to bind Inkscape to Java, and thence + * This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * * Authors: diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index 6dc8c9a9b..db112708e 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -1,6 +1,6 @@ /** * @file - * @brief This is a simple mechanism to bind Inkscape to Java, and thence + * This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * * Authors: -- cgit v1.2.3 From 4108bc8d8212fb10de78f44d1af5171afc71b729 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 18 Oct 2011 22:09:42 +0200 Subject: cppcheck (bzr r10683) --- src/bind/javabind.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index db112708e..f1a3423fe 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -568,7 +568,7 @@ static const char *commonJavaPaths[] = static bool findJVM(String &result) { std::vector results; - int found = false; + bool found = false; /* Is there one specified by the user? */ const char *javaHome = getenv("JAVA_HOME"); @@ -586,7 +586,7 @@ static bool findJVM(String &result) { return false; } - if (results.size() == 0) + if (results.empty()) return false; //Look first for a Client VM for (unsigned int i=0 ; i Date: Sun, 23 Oct 2011 01:01:33 -0700 Subject: Documentation update pass. (bzr r10692) --- src/bind/javabind.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index f1a3423fe..41da00e81 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -3,6 +3,16 @@ * This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * + * Note: We must limit Java or JVM-specific code to this file + * and to dobinding.cpp. It should be hidden from javabind.h + * + * This file is mostly about getting things up and running, and + * providing the basic C-to-Java hooks. + * + * dobinding.cpp will have the rote and repetitious + * class-by-class binding + */ +/* * Authors: * Bob Jamison * @@ -59,16 +69,6 @@ #include #include -/** - * Note: We must limit Java or JVM-specific code to this file - * and to dobinding.cpp. It should be hidden from javabind.h - * - * This file is mostly about getting things up and running, and - * providing the basic C-to-Java hooks. - * - * dobinding.cpp will have the rote and repetitious - * class-by-class binding - */ namespace Inkscape -- cgit v1.2.3 From 1a5d5d8a7e796035bc70d5c727d4d901dda50726 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 25 Oct 2011 00:45:35 -0700 Subject: Cleanup pass on documentation that was dumping garbage into doxygen output. (bzr r10696) --- src/bind/javabind-private.h | 9 +++++---- src/bind/javabind.h | 9 +++++---- src/bind/javainc/jni.h | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/bind') diff --git a/src/bind/javabind-private.h b/src/bind/javabind-private.h index a03f0c1a2..56ff2e2ff 100644 --- a/src/bind/javabind-private.h +++ b/src/bind/javabind-private.h @@ -2,7 +2,8 @@ * @file * @brief This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. - * + */ +/* * Authors: * Bob Jamison * @@ -23,8 +24,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __JAVABIND_PRIVATE_H__ -#define __JAVABIND_PRIVATE_H__ +#ifndef SEEN_JAVABIND_PRIVATE_H +#define SEEN_JAVABIND_PRIVATE_H #include #include "javabind.h" @@ -139,7 +140,7 @@ void setString(JNIEnv *env, jobject obj, const char *name, const String &val); } // namespace Bind } // namespace Inkscape -#endif /* __JAVABIND_PRIVATE_H__ */ +#endif // SEEN_JAVABIND_PRIVATE_H //######################################################################## //# E N D O F F I L E //######################################################################## diff --git a/src/bind/javabind.h b/src/bind/javabind.h index 894f52d5d..254548bfb 100644 --- a/src/bind/javabind.h +++ b/src/bind/javabind.h @@ -2,7 +2,8 @@ * @file * @brief This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. - * + */ +/* * Authors: * Bob Jamison * @@ -23,8 +24,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __JAVABIND_H__ -#define __JAVABIND_H__ +#ifndef SEEN_JAVABIND_H +#define SEEN_JAVABIND_H #include #include @@ -397,7 +398,7 @@ protected: } // namespace Bind } // namespace Inkscape -#endif /* __JAVABIND_H__ */ +#endif // SEEN_JAVABIND_H //######################################################################## //# E N D O F F I L E //######################################################################## diff --git a/src/bind/javainc/jni.h b/src/bind/javainc/jni.h index a10aaea72..5989c043f 100644 --- a/src/bind/javainc/jni.h +++ b/src/bind/javainc/jni.h @@ -28,7 +28,7 @@ * point of our design and implementation. */ -/****************************************************************************** +/* *************************************************************************** * Java Runtime Interface * Copyright (c) 1996 Netscape Communications Corporation. All rights reserved. *****************************************************************************/ -- cgit v1.2.3 From 2633767789e4264b13ef91a684accf734fb4e94f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 26 Oct 2011 21:55:51 -0700 Subject: Fixing more broken and split doc comments. (bzr r10697) --- src/bind/dobinding.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/dobinding.cpp b/src/bind/dobinding.cpp index 284565e92..5e783e59d 100644 --- a/src/bind/dobinding.cpp +++ b/src/bind/dobinding.cpp @@ -1,5 +1,4 @@ -/** - * @file +/* * This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * -- cgit v1.2.3 From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 8 Dec 2011 11:53:54 +0000 Subject: Switch to top-level glib headers. Thanks to DimStar for patch Fixed bugs: - https://launchpad.net/bugs/898538 (bzr r10762) --- src/bind/javabind.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index 41da00e81..d2091eb1b 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -62,7 +62,7 @@ #include "javabind-private.h" #include #include -#include +#include //For repr and document #include -- cgit v1.2.3