jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic corrections - Mac OS X

Browse source
This commit is contained in:
William S Fulton 2015-08-02 20:13:40 +01:00
commit c6f8aadc64
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/Manual/Contents.html
View file

@ -1072,7 +1072,7 @@
</ul> </ul>
<li><a href="Javascript.html#Javascript_embedded_webkit">Embedded Webkit</a> <li><a href="Javascript.html#Javascript_embedded_webkit">Embedded Webkit</a>
<ul> <ul>
<li><a href="Javascript.html#Javascript_osx">OSX</a> <li><a href="Javascript.html#Javascript_osx">Mac OS X</a>
<li><a href="Javascript.html#Javascript_gtk">GTK</a> <li><a href="Javascript.html#Javascript_gtk">GTK</a>
</ul> </ul>
<li><a href="Javascript.html#Javascript_applications_webkit">Creating Applications with node-webkit</a> <li><a href="Javascript.html#Javascript_applications_webkit">Creating Applications with node-webkit</a>

10
Doc/Manual/Javascript.html
View file

@ -25,7 +25,7 @@
</ul> </ul>
<li><a href="#Javascript_embedded_webkit">Embedded Webkit</a> <li><a href="#Javascript_embedded_webkit">Embedded Webkit</a>
<ul> <ul>
<li><a href="#Javascript_osx">OSX</a> <li><a href="#Javascript_osx">Mac OS X</a>
<li><a href="#Javascript_gtk">GTK</a> <li><a href="#Javascript_gtk">GTK</a>
</ul> </ul>
<li><a href="#Javascript_applications_webkit">Creating Applications with node-webkit</a> <li><a href="#Javascript_applications_webkit">Creating Applications with node-webkit</a>
@ -156,7 +156,7 @@ $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
<li><p><code>instanceOf</code> does not work under JSC</p></li> <li><p><code>instanceOf</code> does not work under JSC</p></li>
</ul> </ul>
<p>The primary development environment has been Linux (Ubuntu 12.04). Windows and OSX have been tested sporadically. Therefore, the generators might have more issues on those platforms. Please report back any problem you observe to help us improving this module quickly.</p> <p>The primary development environment has been Linux (Ubuntu 12.04). Windows and Mac OS X have been tested sporadically. Therefore, the generators might have more issues on those platforms. Please report back any problem you observe to help us improving this module quickly.</p>
<H2><a name="Javascript_integration"></a>26.3 Integration</H2> <H2><a name="Javascript_integration"></a>26.3 Integration</H2>
@ -166,7 +166,7 @@ $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
<H3><a name="Javascript_node_extensions"></a>26.3.1 Creating node.js Extensions</H3> <H3><a name="Javascript_node_extensions"></a>26.3.1 Creating node.js Extensions</H3>
<p>To install <code>node.js</code> you can download an installer from their <a href="https://launchpad.net/~chris-lea/+archive/node.js">web-site</a> for OSX and Windows. For Linux you can either build the source yourself and run <code>sudo checkinstall</code> or keep to the (probably stone-age) packaged version. For Ubuntu there is a <a href="https://launchpad.net/~chris-lea/+archive/node.js/">PPA</a> available.</p> <p>To install <code>node.js</code> you can download an installer from their <a href="https://launchpad.net/~chris-lea/+archive/node.js">web-site</a> for Mac OS X and Windows. For Linux you can either build the source yourself and run <code>sudo checkinstall</code> or keep to the (probably stone-age) packaged version. For Ubuntu there is a <a href="https://launchpad.net/~chris-lea/+archive/node.js/">PPA</a> available.</p>
<div class="shell"> <div class="shell">
<pre> <pre>
$ sudo add-apt-repository ppa:chris-lea/node.js $ sudo add-apt-repository ppa:chris-lea/node.js
@ -224,9 +224,9 @@ $ sudo apt-get remove gyp</pre>
<H3><a name="Javascript_embedded_webkit"></a>26.3.2 Embedded Webkit</H3> <H3><a name="Javascript_embedded_webkit"></a>26.3.2 Embedded Webkit</H3>
<p>Webkit is pre-installed on OSX and available as a library for GTK.</p> <p>Webkit is pre-installed on Mac OS X and available as a library for GTK.</p>
<H4><a name="Javascript_osx"></a>26.3.2.1 OSX</H4> <H4><a name="Javascript_osx"></a>26.3.2.1 Mac OS X</H4>
<p>There is general information about programming with WebKit on <a href="https://developer.apple.com/library/mac/documentation/cocoa/conceptual/DisplayWebContent/DisplayWebContent.html">Apple Developer Documentation</a>. Details about <code>Cocoa</code> programming are not covered here.</p> <p>There is general information about programming with WebKit on <a href="https://developer.apple.com/library/mac/documentation/cocoa/conceptual/DisplayWebContent/DisplayWebContent.html">Apple Developer Documentation</a>. Details about <code>Cocoa</code> programming are not covered here.</p>

2
Examples/test-suite/errors/Makefile.in
View file

@ -32,7 +32,7 @@ include $(srcdir)/../common.mk
# Portable dos2unix / todos for stripping CR # Portable dos2unix / todos for stripping CR
TODOS = tr -d '\r' TODOS = tr -d '\r'
#TODOS = sed -e 's/\r$$//' # On OSX behaves as if written 's/r$$//' #TODOS = sed -e 's/\r$$//' # On Mac OS X behaves as if written 's/r$$//'
# strip source directory from output, so that diffs compare # strip source directory from output, so that diffs compare
STRIP_SRCDIR = sed -e 's|\\|/|g' -e 's|^$(SRCDIR)||' STRIP_SRCDIR = sed -e 's|\\|/|g' -e 's|^$(SRCDIR)||'

2
Source/Modules/javascript.cxx
View file

@ -1100,7 +1100,7 @@ int JSEmitter::emitSetter(Node *n, bool is_member, bool is_static) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
int JSEmitter::emitConstant(Node *n) { int JSEmitter::emitConstant(Node *n) {
// HACK: somehow it happened under OSX that before everything started // HACK: somehow it happened under Mac OS X that before everything started
// a lot of SWIG internal constants were emitted // a lot of SWIG internal constants were emitted
// This didn't happen on other platforms yet... // This didn't happen on other platforms yet...
// we ignore those premature definitions // we ignore those premature definitions

2
Tools/javascript/Makefile.in
View file

@ -14,7 +14,7 @@
all: javascript all: javascript
CC = @CC@ CC = @CC@
# HACK: under OSX a g++ compiled interpreter is seg-faulting when loading module libraries # HACK: under Mac OS X a g++ compiled interpreter is seg-faulting when loading module libraries
# with 'c++' it works... probably some missing flags? # with 'c++' it works... probably some missing flags?
JSCXX = @JSINTERPRETERCXX@ JSCXX = @JSINTERPRETERCXX@
CPPFLAGS = @BOOST_CPPFLAGS@ CPPFLAGS = @BOOST_CPPFLAGS@

2
configure.ac
View file

@ -357,7 +357,7 @@ fi
# On darwin 10.7,10.8,10.9 using clang++, need to ensure using # On darwin 10.7,10.8,10.9 using clang++, need to ensure using
# libc++ for tests and examples to run under mono. May affect # libc++ for tests and examples to run under mono. May affect
# other language targets as well - problem is an OSX incompatibility # other language targets as well - problem is a Mac OS X incompatibility
# between libraries depending on libstdc++ and libc++. # between libraries depending on libstdc++ and libc++.
CLANGXX= CLANGXX=
$CXX -v 2>&1 | grep -i clang >/dev/null && CLANGXX=yes $CXX -v 2>&1 | grep -i clang >/dev/null && CLANGXX=yes