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 5 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 (limited to 'Examples/javascript/class') 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 -- 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/class') 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 +- 5 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 Examples/javascript/class/binding.gyp create mode 100644 Examples/javascript/class/binding.gyp.in (limited to 'Examples/javascript/class') 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 ----- -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Examples/javascript/class') 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": [ "