From 7cd9063b52d29bf3a5c6cee8d272b75a1012756b Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Fri, 2 May 2014 16:01:55 +0200 Subject: Remove execute permissions from various non-executable files - source files and Makefiles need never be executable - scripts are run directly by their interpreters in the test suites, so also do not need to be executable --- Examples/javascript/class/Makefile | 0 Examples/javascript/class/example.cxx | 0 Examples/javascript/class/example.h | 0 Examples/javascript/class/example.i | 0 Examples/javascript/class/runme.js | 0 Examples/javascript/constant/Makefile | 0 Examples/javascript/constant/example.i | 0 Examples/javascript/constant/runme.js | 0 Examples/javascript/enum/Makefile | 0 Examples/javascript/enum/example.cxx | 0 Examples/javascript/enum/example.h | 0 Examples/javascript/enum/example.i | 0 Examples/javascript/enum/runme.js | 0 Examples/javascript/exception/Makefile | 0 Examples/javascript/functor/Makefile | 0 Examples/javascript/nspace/Makefile | 0 Examples/javascript/operator/Makefile | 0 Examples/javascript/overload/Makefile | 0 Examples/javascript/pointer/Makefile | 0 Examples/javascript/pointer/example.cxx | 0 Examples/javascript/pointer/example.i | 0 Examples/javascript/pointer/runme.js | 0 Examples/javascript/reference/Makefile | 0 Examples/javascript/reference/example.cxx | 0 Examples/javascript/reference/example.h | 0 Examples/javascript/reference/example.i | 0 Examples/javascript/reference/runme.js | 0 Examples/javascript/simple/Makefile | 0 Examples/javascript/simple/runme.js | 0 Examples/javascript/template/Makefile | 0 Examples/javascript/variables/Makefile | 0 Examples/javascript/variables/example.cxx | 0 Examples/javascript/variables/example.h | 0 Examples/javascript/variables/example.i | 0 Examples/javascript/variables/runme.js | 0 35 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Examples/javascript/class/Makefile mode change 100755 => 100644 Examples/javascript/class/example.cxx mode change 100755 => 100644 Examples/javascript/class/example.h mode change 100755 => 100644 Examples/javascript/class/example.i mode change 100755 => 100644 Examples/javascript/class/runme.js mode change 100755 => 100644 Examples/javascript/constant/Makefile mode change 100755 => 100644 Examples/javascript/constant/example.i mode change 100755 => 100644 Examples/javascript/constant/runme.js mode change 100755 => 100644 Examples/javascript/enum/Makefile mode change 100755 => 100644 Examples/javascript/enum/example.cxx mode change 100755 => 100644 Examples/javascript/enum/example.h mode change 100755 => 100644 Examples/javascript/enum/example.i mode change 100755 => 100644 Examples/javascript/enum/runme.js mode change 100755 => 100644 Examples/javascript/exception/Makefile mode change 100755 => 100644 Examples/javascript/functor/Makefile mode change 100755 => 100644 Examples/javascript/nspace/Makefile mode change 100755 => 100644 Examples/javascript/operator/Makefile mode change 100755 => 100644 Examples/javascript/overload/Makefile mode change 100755 => 100644 Examples/javascript/pointer/Makefile mode change 100755 => 100644 Examples/javascript/pointer/example.cxx mode change 100755 => 100644 Examples/javascript/pointer/example.i mode change 100755 => 100644 Examples/javascript/pointer/runme.js mode change 100755 => 100644 Examples/javascript/reference/Makefile mode change 100755 => 100644 Examples/javascript/reference/example.cxx mode change 100755 => 100644 Examples/javascript/reference/example.h mode change 100755 => 100644 Examples/javascript/reference/example.i mode change 100755 => 100644 Examples/javascript/reference/runme.js mode change 100755 => 100644 Examples/javascript/simple/Makefile mode change 100755 => 100644 Examples/javascript/simple/runme.js mode change 100755 => 100644 Examples/javascript/template/Makefile mode change 100755 => 100644 Examples/javascript/variables/Makefile mode change 100755 => 100644 Examples/javascript/variables/example.cxx mode change 100755 => 100644 Examples/javascript/variables/example.h mode change 100755 => 100644 Examples/javascript/variables/example.i mode change 100755 => 100644 Examples/javascript/variables/runme.js (limited to 'Examples/javascript') diff --git a/Examples/javascript/class/Makefile b/Examples/javascript/class/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/class/example.cxx b/Examples/javascript/class/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/javascript/class/example.h b/Examples/javascript/class/example.h old mode 100755 new mode 100644 diff --git a/Examples/javascript/class/example.i b/Examples/javascript/class/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/class/runme.js b/Examples/javascript/class/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/constant/Makefile b/Examples/javascript/constant/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/constant/example.i b/Examples/javascript/constant/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/constant/runme.js b/Examples/javascript/constant/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/enum/Makefile b/Examples/javascript/enum/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/enum/example.cxx b/Examples/javascript/enum/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/javascript/enum/example.h b/Examples/javascript/enum/example.h old mode 100755 new mode 100644 diff --git a/Examples/javascript/enum/example.i b/Examples/javascript/enum/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/enum/runme.js b/Examples/javascript/enum/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/exception/Makefile b/Examples/javascript/exception/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/nspace/Makefile b/Examples/javascript/nspace/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/operator/Makefile b/Examples/javascript/operator/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/overload/Makefile b/Examples/javascript/overload/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/pointer/Makefile b/Examples/javascript/pointer/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/pointer/example.cxx b/Examples/javascript/pointer/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/javascript/pointer/example.i b/Examples/javascript/pointer/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/pointer/runme.js b/Examples/javascript/pointer/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/reference/Makefile b/Examples/javascript/reference/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/reference/example.cxx b/Examples/javascript/reference/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/javascript/reference/example.h b/Examples/javascript/reference/example.h old mode 100755 new mode 100644 diff --git a/Examples/javascript/reference/example.i b/Examples/javascript/reference/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/reference/runme.js b/Examples/javascript/reference/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/simple/Makefile b/Examples/javascript/simple/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/simple/runme.js b/Examples/javascript/simple/runme.js old mode 100755 new mode 100644 diff --git a/Examples/javascript/template/Makefile b/Examples/javascript/template/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/variables/Makefile b/Examples/javascript/variables/Makefile old mode 100755 new mode 100644 diff --git a/Examples/javascript/variables/example.cxx b/Examples/javascript/variables/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/javascript/variables/example.h b/Examples/javascript/variables/example.h old mode 100755 new mode 100644 diff --git a/Examples/javascript/variables/example.i b/Examples/javascript/variables/example.i old mode 100755 new mode 100644 diff --git a/Examples/javascript/variables/runme.js b/Examples/javascript/variables/runme.js old mode 100755 new mode 100644 -- cgit v1.2.1 From b115c984a97e5f20e9ad5979f1ad606fff549bc3 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 5 May 2014 16:14:31 +1200 Subject: More cleaning up of the class examples --- Examples/javascript/class/example.cxx | 12 ++++++------ Examples/javascript/class/example.h | 18 +++++++++--------- Examples/javascript/class/example.i | 1 - 3 files changed, 15 insertions(+), 16 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/class/example.cxx b/Examples/javascript/class/example.cxx index e23fa6f73..046304519 100644 --- a/Examples/javascript/class/example.cxx +++ b/Examples/javascript/class/example.cxx @@ -1,5 +1,5 @@ -/* File : example.c */ -#include +/* File : example.cxx */ + #include "example.h" #define M_PI 3.14159265358979323846 @@ -11,18 +11,18 @@ void Shape::move(double dx, double dy) { int Shape::nshapes = 0; -double Circle::area(void) { +double Circle::area() { return M_PI*radius*radius; } -double Circle::perimeter(void) { +double Circle::perimeter() { return 2*M_PI*radius; } -double Square::area(void) { +double Square::area() { return width*width; } -double Square::perimeter(void) { +double Square::perimeter() { return 4*width; } diff --git a/Examples/javascript/class/example.h b/Examples/javascript/class/example.h index 64b7684fa..642130cd0 100644 --- a/Examples/javascript/class/example.h +++ b/Examples/javascript/class/example.h @@ -7,11 +7,11 @@ public: } virtual ~Shape() { nshapes--; - }; + } double x, y; void move(double dx, double dy); - virtual double area(void) = 0; - virtual double perimeter(void) = 0; + virtual double area() = 0; + virtual double perimeter() = 0; static int nshapes; }; @@ -19,16 +19,16 @@ class Circle : public Shape { private: double radius; public: - Circle(double r) : radius(r) { }; - virtual double area(void); - virtual double perimeter(void); + Circle(double r) : radius(r) { } + virtual double area(); + virtual double perimeter(); }; class Square : public Shape { private: double width; public: - Square(double w) : width(w) { }; - virtual double area(void); - virtual double perimeter(void); + Square(double w) : width(w) { } + virtual double area(); + virtual double perimeter(); }; diff --git a/Examples/javascript/class/example.i b/Examples/javascript/class/example.i index 75700b305..fbdf7249f 100644 --- a/Examples/javascript/class/example.i +++ b/Examples/javascript/class/example.i @@ -7,4 +7,3 @@ /* Let's just grab the original header file here */ %include "example.h" - -- cgit v1.2.1 From f574a34155e4ede49b1b023494e0a1637ab89f8f Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Sun, 11 May 2014 23:21:10 +0200 Subject: Allow examples and test-suite to be built out of source tree - Examples/Makefile.in rules use SRCDIR as the relative source directory - ./config.status replicates Examples/ source directory tree in build directory, and copies each Makefile to build directory, prefixed with a header which sets SRCDIR to source directory - Examples/test-suite/.../Makefile.in set SRCDIR from Autoconf-set srcdir - Examples/test-suite/errors/Makefile.in needs to filter out source directory from SWIG error messages - Lua: embedded interpreters are passed location of run-time test - Python: copy run-time scripts to build directory because of 2to3 conversion; import_packages example copies __init__.py from source directory; test-suite sets SCRIPTDIR to location of run-time tests - Javascript: binding.gyp renamed to binding.gyp.in so that $srcdir can be substituted with SRCDIR; removed './' from require() statements so that NODE_PATH can be used to point Node.js to build directory --- Examples/javascript/class/Makefile | 2 +- Examples/javascript/class/binding.gyp | 8 -------- Examples/javascript/class/binding.gyp.in | 9 +++++++++ Examples/javascript/class/example.js | 2 +- Examples/javascript/class/runme.js | 2 +- Examples/javascript/constant/Makefile | 2 +- Examples/javascript/constant/binding.gyp | 8 -------- Examples/javascript/constant/binding.gyp.in | 9 +++++++++ Examples/javascript/constant/example.js | 2 +- Examples/javascript/constant/runme.js | 2 +- Examples/javascript/enum/Makefile | 2 +- Examples/javascript/enum/binding.gyp | 8 -------- Examples/javascript/enum/binding.gyp.in | 9 +++++++++ Examples/javascript/enum/example.js | 2 +- Examples/javascript/enum/runme.js | 2 +- Examples/javascript/example.mk | 8 ++++---- Examples/javascript/exception/Makefile | 2 +- Examples/javascript/exception/binding.gyp | 29 --------------------------- Examples/javascript/exception/binding.gyp.in | 30 ++++++++++++++++++++++++++++ Examples/javascript/exception/example.js | 2 +- Examples/javascript/exception/runme.js | 2 +- Examples/javascript/functor/Makefile | 2 +- Examples/javascript/functor/binding.gyp | 8 -------- Examples/javascript/functor/binding.gyp.in | 9 +++++++++ Examples/javascript/functor/example.js | 2 +- Examples/javascript/functor/runme.js | 2 +- Examples/javascript/nspace/Makefile | 2 +- Examples/javascript/nspace/binding.gyp | 8 -------- Examples/javascript/nspace/binding.gyp.in | 9 +++++++++ Examples/javascript/nspace/example.js | 2 +- Examples/javascript/nspace/runme.js | 2 +- Examples/javascript/operator/Makefile | 2 +- Examples/javascript/operator/binding.gyp | 8 -------- Examples/javascript/operator/binding.gyp.in | 9 +++++++++ Examples/javascript/operator/example.js | 2 +- Examples/javascript/operator/runme.js | 2 +- Examples/javascript/overload/Makefile | 2 +- Examples/javascript/overload/binding.gyp | 8 -------- Examples/javascript/overload/binding.gyp.in | 9 +++++++++ Examples/javascript/overload/example.js | 2 +- Examples/javascript/overload/runme.js | 2 +- Examples/javascript/pointer/Makefile | 2 +- Examples/javascript/pointer/binding.gyp | 8 -------- Examples/javascript/pointer/binding.gyp.in | 9 +++++++++ Examples/javascript/pointer/example.js | 2 +- Examples/javascript/pointer/runme.js | 2 +- Examples/javascript/reference/Makefile | 2 +- Examples/javascript/reference/binding.gyp | 8 -------- Examples/javascript/reference/binding.gyp.in | 9 +++++++++ Examples/javascript/reference/example.js | 2 +- Examples/javascript/reference/runme.js | 2 +- Examples/javascript/simple/Makefile | 2 +- Examples/javascript/simple/binding.gyp | 8 -------- Examples/javascript/simple/binding.gyp.in | 9 +++++++++ Examples/javascript/simple/example.js | 2 +- Examples/javascript/simple/runme.js | 2 +- Examples/javascript/template/Makefile | 2 +- Examples/javascript/template/binding.gyp | 8 -------- Examples/javascript/template/binding.gyp.in | 9 +++++++++ Examples/javascript/template/example.js | 2 +- Examples/javascript/template/runme.js | 2 +- Examples/javascript/variables/Makefile | 2 +- Examples/javascript/variables/binding.gyp | 8 -------- Examples/javascript/variables/binding.gyp.in | 9 +++++++++ Examples/javascript/variables/example.js | 2 +- Examples/javascript/variables/runme.js | 2 +- 66 files changed, 181 insertions(+), 168 deletions(-) delete mode 100644 Examples/javascript/class/binding.gyp create mode 100644 Examples/javascript/class/binding.gyp.in delete mode 100644 Examples/javascript/constant/binding.gyp create mode 100644 Examples/javascript/constant/binding.gyp.in delete mode 100644 Examples/javascript/enum/binding.gyp create mode 100644 Examples/javascript/enum/binding.gyp.in delete mode 100644 Examples/javascript/exception/binding.gyp create mode 100644 Examples/javascript/exception/binding.gyp.in delete mode 100644 Examples/javascript/functor/binding.gyp create mode 100644 Examples/javascript/functor/binding.gyp.in delete mode 100644 Examples/javascript/nspace/binding.gyp create mode 100644 Examples/javascript/nspace/binding.gyp.in delete mode 100644 Examples/javascript/operator/binding.gyp create mode 100644 Examples/javascript/operator/binding.gyp.in delete mode 100644 Examples/javascript/overload/binding.gyp create mode 100644 Examples/javascript/overload/binding.gyp.in delete mode 100644 Examples/javascript/pointer/binding.gyp create mode 100644 Examples/javascript/pointer/binding.gyp.in delete mode 100644 Examples/javascript/reference/binding.gyp create mode 100644 Examples/javascript/reference/binding.gyp.in delete mode 100644 Examples/javascript/simple/binding.gyp create mode 100644 Examples/javascript/simple/binding.gyp.in delete mode 100644 Examples/javascript/template/binding.gyp create mode 100644 Examples/javascript/template/binding.gyp.in delete mode 100644 Examples/javascript/variables/binding.gyp create mode 100644 Examples/javascript/variables/binding.gyp.in (limited to 'Examples/javascript') diff --git a/Examples/javascript/class/Makefile b/Examples/javascript/class/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/class/Makefile +++ b/Examples/javascript/class/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/class/binding.gyp b/Examples/javascript/class/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/class/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/class/binding.gyp.in b/Examples/javascript/class/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/class/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/class/example.js b/Examples/javascript/class/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/class/example.js +++ b/Examples/javascript/class/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/class/runme.js b/Examples/javascript/class/runme.js index e1d5d9797..6a77b8d8e 100644 --- a/Examples/javascript/class/runme.js +++ b/Examples/javascript/class/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); // ----- Object creation ----- diff --git a/Examples/javascript/constant/Makefile b/Examples/javascript/constant/Makefile index ea04c7df8..0402f8d09 100644 --- a/Examples/javascript/constant/Makefile +++ b/Examples/javascript/constant/Makefile @@ -1,3 +1,3 @@ SRCS = -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/constant/binding.gyp b/Examples/javascript/constant/binding.gyp deleted file mode 100644 index 69af46b22..000000000 --- a/Examples/javascript/constant/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/constant/binding.gyp.in b/Examples/javascript/constant/binding.gyp.in new file mode 100644 index 000000000..59779aef4 --- /dev/null +++ b/Examples/javascript/constant/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/constant/example.js b/Examples/javascript/constant/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/constant/example.js +++ b/Examples/javascript/constant/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/constant/runme.js b/Examples/javascript/constant/runme.js index f4b55881e..f29d1a850 100644 --- a/Examples/javascript/constant/runme.js +++ b/Examples/javascript/constant/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); console.log("ICONST = " + example.ICONST + " (should be 42)"); console.log("FCONST = " + example.FCONST + " (should be 2.1828)"); diff --git a/Examples/javascript/enum/Makefile b/Examples/javascript/enum/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/enum/Makefile +++ b/Examples/javascript/enum/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/enum/binding.gyp b/Examples/javascript/enum/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/enum/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/enum/binding.gyp.in b/Examples/javascript/enum/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/enum/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/enum/example.js b/Examples/javascript/enum/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/enum/example.js +++ b/Examples/javascript/enum/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/enum/runme.js b/Examples/javascript/enum/runme.js index d4e89e8c8..851d43c4b 100644 --- a/Examples/javascript/enum/runme.js +++ b/Examples/javascript/enum/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); // ----- Object creation ----- diff --git a/Examples/javascript/example.mk b/Examples/javascript/example.mk index 274eff1a3..5a335bba4 100644 --- a/Examples/javascript/example.mk +++ b/Examples/javascript/example.mk @@ -15,13 +15,13 @@ INTERFACE = example.i SWIGOPT=-$(JSENGINE) check: build - $(MAKE) -f $(EXAMPLES_TOP)/Makefile JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run + $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run build: - $(MAKE) -f $(EXAMPLES_TOP)/Makefile CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \ + $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_wrapper_cpp - $(MAKE) -f $(EXAMPLES_TOP)/Makefile CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \ + $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' JSENGINE='$(JSENGINE)' javascript_build_cpp clean: - $(MAKE) -f $(EXAMPLES_TOP)/Makefile javascript_clean + $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' javascript_clean diff --git a/Examples/javascript/exception/Makefile b/Examples/javascript/exception/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/exception/Makefile +++ b/Examples/javascript/exception/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/exception/binding.gyp b/Examples/javascript/exception/binding.gyp deleted file mode 100644 index 2be0a17a2..000000000 --- a/Examples/javascript/exception/binding.gyp +++ /dev/null @@ -1,29 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ], - 'defines': [ - 'BUILDING_NODE_EXTENSION=1', - ], - 'conditions': [ - ['OS=="mac"', - { - 'xcode_settings': { - 'GCC_ENABLE_CPP_RTTI': 'YES', - 'GCC_ENABLE_CPP_EXCEPTIONS' : 'YES' - } - } - ], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', - { - 'cflags': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter"], - 'cflags_cc': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter"], - 'cflags!': [ '-fno-exceptions' ], - 'cflags_cc!': [ '-fno-exceptions', '-fno-rtti' ] - } - ] - ] - } - ] -} diff --git a/Examples/javascript/exception/binding.gyp.in b/Examples/javascript/exception/binding.gyp.in new file mode 100644 index 000000000..577a5c2e3 --- /dev/null +++ b/Examples/javascript/exception/binding.gyp.in @@ -0,0 +1,30 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"], + 'defines': [ + 'BUILDING_NODE_EXTENSION=1', + ], + 'conditions': [ + ['OS=="mac"', + { + 'xcode_settings': { + 'GCC_ENABLE_CPP_RTTI': 'YES', + 'GCC_ENABLE_CPP_EXCEPTIONS' : 'YES' + } + } + ], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', + { + 'cflags': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter"], + 'cflags_cc': [ "-Wno-unused-variable", "-Wno-unused-but-set-variable", "-Wno-unused-but-set-parameter"], + 'cflags!': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions', '-fno-rtti' ] + } + ] + ] + } + ] +} diff --git a/Examples/javascript/exception/example.js b/Examples/javascript/exception/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/exception/example.js +++ b/Examples/javascript/exception/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/exception/runme.js b/Examples/javascript/exception/runme.js index 977f51ebc..43ce66d6d 100644 --- a/Examples/javascript/exception/runme.js +++ b/Examples/javascript/exception/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); console.log("Trying to catch some exceptions."); t = new example.Test(); diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/functor/Makefile +++ b/Examples/javascript/functor/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/functor/binding.gyp b/Examples/javascript/functor/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/functor/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/functor/binding.gyp.in b/Examples/javascript/functor/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/functor/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/functor/example.js b/Examples/javascript/functor/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/functor/example.js +++ b/Examples/javascript/functor/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/functor/runme.js b/Examples/javascript/functor/runme.js index dc12470f4..28dc64320 100644 --- a/Examples/javascript/functor/runme.js +++ b/Examples/javascript/functor/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); a = new example.intSum(0); b = new example.doubleSum(100.0); diff --git a/Examples/javascript/nspace/Makefile b/Examples/javascript/nspace/Makefile index ea04c7df8..0402f8d09 100644 --- a/Examples/javascript/nspace/Makefile +++ b/Examples/javascript/nspace/Makefile @@ -1,3 +1,3 @@ SRCS = -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/nspace/binding.gyp b/Examples/javascript/nspace/binding.gyp deleted file mode 100644 index 69af46b22..000000000 --- a/Examples/javascript/nspace/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/nspace/binding.gyp.in b/Examples/javascript/nspace/binding.gyp.in new file mode 100644 index 000000000..59779aef4 --- /dev/null +++ b/Examples/javascript/nspace/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/nspace/example.js b/Examples/javascript/nspace/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/nspace/example.js +++ b/Examples/javascript/nspace/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/nspace/runme.js b/Examples/javascript/nspace/runme.js index d6a49d8d4..fad73477d 100644 --- a/Examples/javascript/nspace/runme.js +++ b/Examples/javascript/nspace/runme.js @@ -3,7 +3,7 @@ // This file illustrates class C++ interface generated // by SWIG. -var example = require("./example"); +var example = require("example"); // Calling a module function ( aka global function ) if (example.module_function() !== 7) { diff --git a/Examples/javascript/operator/Makefile b/Examples/javascript/operator/Makefile index ea04c7df8..0402f8d09 100644 --- a/Examples/javascript/operator/Makefile +++ b/Examples/javascript/operator/Makefile @@ -1,3 +1,3 @@ SRCS = -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/operator/binding.gyp b/Examples/javascript/operator/binding.gyp deleted file mode 100644 index 69af46b22..000000000 --- a/Examples/javascript/operator/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/operator/binding.gyp.in b/Examples/javascript/operator/binding.gyp.in new file mode 100644 index 000000000..59779aef4 --- /dev/null +++ b/Examples/javascript/operator/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/operator/example.js b/Examples/javascript/operator/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/operator/example.js +++ b/Examples/javascript/operator/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/operator/runme.js b/Examples/javascript/operator/runme.js index a700918d6..f72ca1c28 100644 --- a/Examples/javascript/operator/runme.js +++ b/Examples/javascript/operator/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); a = new example.Complex(2,3); b = new example.Complex(-5,10); diff --git a/Examples/javascript/overload/Makefile b/Examples/javascript/overload/Makefile index ea04c7df8..0402f8d09 100644 --- a/Examples/javascript/overload/Makefile +++ b/Examples/javascript/overload/Makefile @@ -1,3 +1,3 @@ SRCS = -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/overload/binding.gyp b/Examples/javascript/overload/binding.gyp deleted file mode 100644 index 69af46b22..000000000 --- a/Examples/javascript/overload/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/overload/binding.gyp.in b/Examples/javascript/overload/binding.gyp.in new file mode 100644 index 000000000..59779aef4 --- /dev/null +++ b/Examples/javascript/overload/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/overload/example.js b/Examples/javascript/overload/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/overload/example.js +++ b/Examples/javascript/overload/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/overload/runme.js b/Examples/javascript/overload/runme.js index 1e6c861a6..1c23e3b6b 100644 --- a/Examples/javascript/overload/runme.js +++ b/Examples/javascript/overload/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); example.f(); example.f(1); diff --git a/Examples/javascript/pointer/Makefile b/Examples/javascript/pointer/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/pointer/Makefile +++ b/Examples/javascript/pointer/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/pointer/binding.gyp b/Examples/javascript/pointer/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/pointer/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/pointer/binding.gyp.in b/Examples/javascript/pointer/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/pointer/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/pointer/example.js b/Examples/javascript/pointer/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/pointer/example.js +++ b/Examples/javascript/pointer/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/pointer/runme.js b/Examples/javascript/pointer/runme.js index fb8cf0c74..e9fa9a0bc 100644 --- a/Examples/javascript/pointer/runme.js +++ b/Examples/javascript/pointer/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); // First create some objects using the pointer library. console.log("Testing the pointer library"); diff --git a/Examples/javascript/reference/Makefile b/Examples/javascript/reference/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/reference/Makefile +++ b/Examples/javascript/reference/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/reference/binding.gyp b/Examples/javascript/reference/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/reference/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/reference/binding.gyp.in b/Examples/javascript/reference/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/reference/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/reference/example.js b/Examples/javascript/reference/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/reference/example.js +++ b/Examples/javascript/reference/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/reference/runme.js b/Examples/javascript/reference/runme.js index 88c108314..04f732520 100644 --- a/Examples/javascript/reference/runme.js +++ b/Examples/javascript/reference/runme.js @@ -1,5 +1,5 @@ // This file illustrates the manipulation of C++ references in Javascript. -var example = require("./example"); +var example = require("example"); // ----- Object creation ----- diff --git a/Examples/javascript/simple/Makefile b/Examples/javascript/simple/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/simple/Makefile +++ b/Examples/javascript/simple/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/simple/binding.gyp b/Examples/javascript/simple/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/simple/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/simple/binding.gyp.in b/Examples/javascript/simple/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/simple/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/simple/example.js b/Examples/javascript/simple/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/simple/example.js +++ b/Examples/javascript/simple/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/simple/runme.js b/Examples/javascript/simple/runme.js index be2c18669..4abff0e2a 100644 --- a/Examples/javascript/simple/runme.js +++ b/Examples/javascript/simple/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); /* Call our gcd() function */ diff --git a/Examples/javascript/template/Makefile b/Examples/javascript/template/Makefile index ea04c7df8..0402f8d09 100644 --- a/Examples/javascript/template/Makefile +++ b/Examples/javascript/template/Makefile @@ -1,3 +1,3 @@ SRCS = -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/template/binding.gyp b/Examples/javascript/template/binding.gyp deleted file mode 100644 index 69af46b22..000000000 --- a/Examples/javascript/template/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/template/binding.gyp.in b/Examples/javascript/template/binding.gyp.in new file mode 100644 index 000000000..59779aef4 --- /dev/null +++ b/Examples/javascript/template/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/template/example.js b/Examples/javascript/template/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/template/example.js +++ b/Examples/javascript/template/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/template/runme.js b/Examples/javascript/template/runme.js index 55894dfd5..af96ac7f9 100644 --- a/Examples/javascript/template/runme.js +++ b/Examples/javascript/template/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); //Call some templated functions console.log(example.maxint(3,7)); diff --git a/Examples/javascript/variables/Makefile b/Examples/javascript/variables/Makefile index 31846faae..54a8f7b03 100644 --- a/Examples/javascript/variables/Makefile +++ b/Examples/javascript/variables/Makefile @@ -1,3 +1,3 @@ SRCS = example.cxx -include ../example.mk +include $(SRCDIR)../example.mk diff --git a/Examples/javascript/variables/binding.gyp b/Examples/javascript/variables/binding.gyp deleted file mode 100644 index 54eebfaa0..000000000 --- a/Examples/javascript/variables/binding.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - "targets": [ - { - "target_name": "example", - "sources": [ "example.cxx", "example_wrap.cxx" ] - } - ] -} diff --git a/Examples/javascript/variables/binding.gyp.in b/Examples/javascript/variables/binding.gyp.in new file mode 100644 index 000000000..c56a650e9 --- /dev/null +++ b/Examples/javascript/variables/binding.gyp.in @@ -0,0 +1,9 @@ +{ + "targets": [ + { + "target_name": "example", + "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "include_dirs": ["$srcdir"] + } + ] +} diff --git a/Examples/javascript/variables/example.js b/Examples/javascript/variables/example.js index 79cd3913f..2e7f83a06 100644 --- a/Examples/javascript/variables/example.js +++ b/Examples/javascript/variables/example.js @@ -1 +1 @@ -module.exports = require("./build/Release/example"); +module.exports = require("build/Release/example"); diff --git a/Examples/javascript/variables/runme.js b/Examples/javascript/variables/runme.js index 537e17296..a2b5f791c 100644 --- a/Examples/javascript/variables/runme.js +++ b/Examples/javascript/variables/runme.js @@ -1,4 +1,4 @@ -var example = require("./example"); +var example = require("example"); // Try to set the values of some global variables example.ivar = 42; -- cgit v1.2.1 From ac89f7f7854907f8b45b42ef1f447234d5eb1c64 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 May 2014 00:59:47 +0100 Subject: Javascript examples tidy up - Remove empty files - Improve clean --- Examples/javascript/functor/Makefile | 2 +- Examples/javascript/functor/binding.gyp.in | 2 +- Examples/javascript/functor/example.cxx | 0 Examples/javascript/pointer/typemaps.i | 0 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Examples/javascript/functor/example.cxx delete mode 100644 Examples/javascript/pointer/typemaps.i (limited to 'Examples/javascript') diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile index 54a8f7b03..0402f8d09 100644 --- a/Examples/javascript/functor/Makefile +++ b/Examples/javascript/functor/Makefile @@ -1,3 +1,3 @@ -SRCS = example.cxx +SRCS = include $(SRCDIR)../example.mk diff --git a/Examples/javascript/functor/binding.gyp.in b/Examples/javascript/functor/binding.gyp.in index c56a650e9..59779aef4 100644 --- a/Examples/javascript/functor/binding.gyp.in +++ b/Examples/javascript/functor/binding.gyp.in @@ -2,7 +2,7 @@ "targets": [ { "target_name": "example", - "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "sources": [ "example_wrap.cxx" ], "include_dirs": ["$srcdir"] } ] diff --git a/Examples/javascript/functor/example.cxx b/Examples/javascript/functor/example.cxx deleted file mode 100644 index e69de29bb..000000000 diff --git a/Examples/javascript/pointer/typemaps.i b/Examples/javascript/pointer/typemaps.i deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.1 From f39ed94419e4a30b8b2ba1d49c138fd245010262 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 24 May 2014 00:14:01 +0100 Subject: Fix compiler warnings in examples when using -std=c++98 -std=gnu89 -pedantic -Wreturn-type --- Examples/javascript/reference/example.cxx | 2 +- Examples/javascript/variables/example.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/reference/example.cxx b/Examples/javascript/reference/example.cxx index 8a513bf49..9dbaed2ee 100644 --- a/Examples/javascript/reference/example.cxx +++ b/Examples/javascript/reference/example.cxx @@ -19,7 +19,7 @@ Vector operator+(const Vector &a, const Vector &b) { char *Vector::print() { static char temp[512]; - sprintf(temp,"Vector %p (%g,%g,%g)", this, x,y,z); + sprintf(temp,"Vector %p (%g,%g,%g)", (void *)this, x,y,z); return temp; } diff --git a/Examples/javascript/variables/example.cxx b/Examples/javascript/variables/example.cxx index f10390a9e..15314b383 100644 --- a/Examples/javascript/variables/example.cxx +++ b/Examples/javascript/variables/example.cxx @@ -57,9 +57,9 @@ void print_vars() { printf("cvar = %c\n", cvar); printf("strvar = %s\n", strvar ? strvar : "(null)"); printf("cstrvar = %s\n", cstrvar); - printf("iptrvar = %p\n", iptrvar); + printf("iptrvar = %p\n", (void *)iptrvar); printf("name = %s\n", name); - printf("ptptr = %p (%d, %d)\n", ptptr, ptptr ? ptptr->x : 0, ptptr ? ptptr->y : 0); + printf("ptptr = %p (%d, %d)\n", (void *)ptptr, ptptr ? ptptr->x : 0, ptptr ? ptptr->y : 0); printf("pt = (%d, %d)\n", pt.x, pt.y); printf("status = %d\n", status); } -- cgit v1.2.1 From 74e17fdbf662d04f21b484616174ca7abdf1d30f Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Wed, 28 May 2014 23:39:10 +0200 Subject: Fix Javascript examples so that "make clean" works properly with node - Need to copy example.cxx to build directory so that build products end up in the right place; use a gyp command expansion to do so --- Examples/javascript/class/binding.gyp.in | 2 +- Examples/javascript/enum/binding.gyp.in | 2 +- Examples/javascript/exception/binding.gyp.in | 2 +- Examples/javascript/pointer/binding.gyp.in | 2 +- Examples/javascript/reference/binding.gyp.in | 2 +- Examples/javascript/simple/binding.gyp.in | 2 +- Examples/javascript/variables/binding.gyp.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/class/binding.gyp.in b/Examples/javascript/class/binding.gyp.in index c56a650e9..cb2b45e8f 100644 --- a/Examples/javascript/class/binding.gyp.in +++ b/Examples/javascript/class/binding.gyp.in @@ -2,7 +2,7 @@ "targets": [ { "target_name": "example", - "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ], + "sources": [ " Date: Mon, 11 Aug 2014 12:27:32 -0500 Subject: Allow to specify V8 version, for example V8_VERSION=0x031511 ENGINE=v8 make check-javascript-examples --- Examples/javascript/example.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/example.mk b/Examples/javascript/example.mk index 5a335bba4..cb8a33efd 100644 --- a/Examples/javascript/example.mk +++ b/Examples/javascript/example.mk @@ -7,12 +7,18 @@ else JSENGINE=node endif +ifneq (, $(V8_VERSION)) + JSV8_VERSION=$(V8_VERSION) +else + JSV8_VERSION=0x031110 +endif + EXAMPLES_TOP=../.. SWIG_TOP=../../.. SWIG = $(SWIG_TOP)/preinst-swig TARGET = example INTERFACE = example.i -SWIGOPT=-$(JSENGINE) +SWIGOPT=-$(JSENGINE) -DV8_VERSION=$(JSV8_VERSION) check: build $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run -- cgit v1.2.1 From 2a662502a50e3ae67f515c03b72173b019d2a878 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 12 Aug 2014 10:02:23 -0500 Subject: Fixed buffer overrun --- Examples/javascript/template/runme.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/template/runme.js b/Examples/javascript/template/runme.js index af96ac7f9..6a29fa77c 100644 --- a/Examples/javascript/template/runme.js +++ b/Examples/javascript/template/runme.js @@ -9,20 +9,20 @@ console.log(example.maxdouble(3.14,2.18)); iv = new example.vecint(100); dv = new example.vecdouble(1000); -for(i=0;i<=100;i++) +for(i=0;i<100;i++) iv.setitem(i,2*i); -for(i=0;i<=1000;i++) +for(i=0;i<1000;i++) dv.setitem(i, 1.0/(i+1)); sum = 0; -for(i=0;i<=100;i++) +for(i=0;i<100;i++) sum = sum + iv.getitem(i); console.log(sum); sum = 0.0; -for(i=0;i<=1000;i++) +for(i=0;i<1000;i++) sum = sum + dv.getitem(i); console.log(sum); -- cgit v1.2.1 From c23375d39d0d02bf414f5c886f8454b8bf05e767 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 22 Aug 2014 18:49:48 -0500 Subject: Show V8 Deprecated warnings --- Examples/javascript/example.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/example.mk b/Examples/javascript/example.mk index cb8a33efd..9afd5b9bf 100644 --- a/Examples/javascript/example.mk +++ b/Examples/javascript/example.mk @@ -18,7 +18,7 @@ SWIG_TOP=../../.. SWIG = $(SWIG_TOP)/preinst-swig TARGET = example INTERFACE = example.i -SWIGOPT=-$(JSENGINE) -DV8_VERSION=$(JSV8_VERSION) +SWIGOPT=-$(JSENGINE) -DV8_VERSION=$(JSV8_VERSION) -DV8_DEPRECATION_WARNINGS check: build $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run -- cgit v1.2.1 From a3946e152028148948584f63fc11e5167d202b35 Mon Sep 17 00:00:00 2001 From: Richard Date: Sat, 23 Aug 2014 01:54:10 -0500 Subject: Remove unneeded parameter --- Examples/javascript/example.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/example.mk b/Examples/javascript/example.mk index 9afd5b9bf..cb8a33efd 100644 --- a/Examples/javascript/example.mk +++ b/Examples/javascript/example.mk @@ -18,7 +18,7 @@ SWIG_TOP=../../.. SWIG = $(SWIG_TOP)/preinst-swig TARGET = example INTERFACE = example.i -SWIGOPT=-$(JSENGINE) -DV8_VERSION=$(JSV8_VERSION) -DV8_DEPRECATION_WARNINGS +SWIGOPT=-$(JSENGINE) -DV8_VERSION=$(JSV8_VERSION) check: build $(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run -- cgit v1.2.1 From 37cd1474b563d413c3ae7df254d9d22b9c6086b8 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 5 Nov 2014 10:42:12 +1300 Subject: Remove bogus ; after } in examples --- Examples/javascript/reference/example.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/reference/example.h b/Examples/javascript/reference/example.h index 4915adb1b..c4820f19a 100644 --- a/Examples/javascript/reference/example.h +++ b/Examples/javascript/reference/example.h @@ -4,8 +4,8 @@ class Vector { private: double x,y,z; public: - Vector() : x(0), y(0), z(0) { }; - Vector(double x, double y, double z) : x(x), y(y), z(z) { }; + Vector() : x(0), y(0), z(0) { } + Vector(double x, double y, double z) : x(x), y(y), z(z) { } friend Vector operator+(const Vector &a, const Vector &b); char *print(); }; -- cgit v1.2.1 From ac1f067ce983e40591461f768df8914b01b5505d Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 5 Nov 2014 10:43:42 +1300 Subject: Eliminate trivial differences between the reference examples --- Examples/javascript/reference/example.h | 4 ---- Examples/javascript/reference/example.i | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'Examples/javascript') diff --git a/Examples/javascript/reference/example.h b/Examples/javascript/reference/example.h index c4820f19a..bcfcfb72f 100644 --- a/Examples/javascript/reference/example.h +++ b/Examples/javascript/reference/example.h @@ -20,7 +20,3 @@ public: Vector &operator[](int); int size(); }; - - - - diff --git a/Examples/javascript/reference/example.i b/Examples/javascript/reference/example.i index 1cf19c82c..173143d79 100644 --- a/Examples/javascript/reference/example.i +++ b/Examples/javascript/reference/example.i @@ -29,7 +29,7 @@ public: VectorArray(int maxsize); ~VectorArray(); int size(); - + /* This wrapper provides an alternative to the [] operator */ %extend { Vector &get(int index) { -- cgit v1.2.1