Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 0441316

Browse files
livecodepanoslivecodepanos
committed
Merge branch 'develop' into feature-inappv2copy
Conflicts: engine/engine.xcodeproj/project.pbxproj
2 parents a2af2ea + c03c61d commit 0441316

818 files changed

Lines changed: 42135 additions & 30891 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Application.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ifeq ($(MODE),debug)
99
APP_PROJECT_PATH := $(call my-dir)/_build/android/debug
1010

1111
APP_OPTIM := debug
12-
APP_CPPFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_DEBUG -fvisibility=hidden -g
13-
APP_CFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_DEBUG -fvisibility=hidden -g
12+
#APP_CPPFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_DEBUG -fvisibility=hidden -g
13+
APP_CFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_DEBUG -DANDROID_NDK -fvisibility=hidden -g
1414

1515
else
1616

1717
APP_PROJECT_PATH := $(call my-dir)/_build/android/release
1818

1919
APP_OPTIM := release
20-
APP_CPPFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_RELEASE -DNDEBUG -fvisibility=hidden -g
21-
APP_CFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_RELEASE -DNDEBUG -fvisibility=hidden -g
20+
#APP_CPPFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_RELEASE -DNDEBUG -fvisibility=hidden -g
21+
APP_CFLAGS += -D_MOBILE -DTARGET_PLATFORM_MOBILE -DTARGET_SUBPLATFORM_ANDROID -D_RELEASE -DANDROID_NDK -DNDEBUG -fvisibility=hidden -g
2222

2323
endif

‎Makefile‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Engine Targets
33

44
.PHONY: libopenssl liburlcache libstubs
5-
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
5+
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore libgraphics libskia
66
.PHONY: revsecurity libgif
77
.PHONY: kernel development standalone webruntime webplugin webplayer server
88
.PHONY: kernel-standalone kernel-development kernel-server
@@ -32,13 +32,19 @@ libgif:
3232
libopenssl:
3333
$(MAKE) -C ./thirdparty/libopenssl libopenssl
3434

35+
libskia:
36+
$(MAKE) -C ./thirdparty/libskia libskia
37+
3538
libcore:
3639
$(MAKE) -C ./libcore libcore
3740

3841
revsecurity:
3942
$(MAKE) -C ./thirdparty/libopenssl -f Makefile.revsecurity revsecurity
4043

41-
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
44+
libgraphics: libskia
45+
$(MAKE) -C ./libgraphics libgraphics
46+
47+
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore libgraphics
4248
$(MAKE) -C ./engine -f Makefile.kernel libkernel
4349

4450
kernel-standalone: kernel
@@ -47,7 +53,7 @@ kernel-standalone: kernel
4753
kernel-development: kernel
4854
$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
4955

50-
kernel-server:
56+
kernel-server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore libgraphics
5157
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
5258

5359
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development revsecurity
@@ -59,7 +65,7 @@ standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecu
5965
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel revsecurity
6066
$(MAKE) -C ./engine -f Makefile.installer installer
6167

62-
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-server revsecurity
68+
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore libgraphics kernel-server revsecurity
6369
$(MAKE) -C ./engine -f Makefile.server server-community
6470

6571
###############################################################################
@@ -131,15 +137,18 @@ server-revdb: libexternal
131137
###############################################################################
132138
# revXML Targets
133139

134-
.PHONY: libxml revxml server-revxml
140+
.PHONY: libxml libxslt revxml server-revxml
135141

136142
libxml:
137143
$(MAKE) -C ./thirdparty/libxml libxml
138144

139-
revxml: libxml libexternal
145+
libxslt:
146+
$(MAKE) -C ./thirdparty/libxslt libxslt
147+
148+
revxml: libxml libxslt libexternal
140149
$(MAKE) -C ./revxml revxml
141150

142-
server-revxml: libxml libexternal
151+
server-revxml: libxml libxslt libexternal
143152
$(MAKE) -C ./revxml server-revxml
144153

145154
###############################################################################

‎docs/dictionary/command/accept.xml‎

100644100755
Lines changed: 67 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,69 @@
11
<doc>
2-
<legacy_id>1099</legacy_id>
3-
<name>accept</name>
4-
<type>command</type>
5-
<syntax>
6-
<example>accept [datagram] connections on port <i>number</i> with message <i>callbackMessage</i></example>
7-
</syntax>
8-
<library></library>
9-
<objects>
10-
</objects>
11-
<synonyms>
12-
</synonyms>
13-
<classification>
14-
<category>Networks &amp; Communication</category>
15-
</classification>
16-
<references>
17-
<command tag="close socket">close socket Command</command>
18-
<function tag="hostNameToAddress">hostNameToAddress Function</function>
19-
<command tag="open socket">open socket Command</command>
20-
<function tag="openSockets">openSockets Function</function>
21-
<command tag="read from socket">read from socket Command</command>
22-
<command tag="write to socket">write to socket Command</command>
23-
<function tag="peerAddress">peerAddress Function</function>
24-
<function tag="hostAddress">hostAddress Function</function>
25-
<function tag="hostAddressToName">hostAddressToName Function</function>
26-
<function tag="hostName">hostName Function</function>
27-
<property tag="HTTPProxy">HTTPProxy Property</property>
28-
</references>
29-
<history>
30-
<introduced version="1.0">Added.</introduced>
31-
</history>
32-
<platforms>
33-
<mac/>
34-
<windows/>
35-
<linux/>
36-
</platforms>
37-
<classes>
38-
<desktop/>
39-
<server/>
40-
<web/>
41-
</classes>
42-
<security>
43-
<network/>
44-
</security>
45-
<summary>Accepts an internet connection and creates a <glossary tag="socket">socket</glossary> for that connection.</summary>
46-
<examples>
47-
<example>accept connections on port 80 with message "webConnect"</example>
48-
<example>accept datagram connections on port it with message myMessage</example>
49-
</examples>
50-
<description>
51-
<p>Use the <b>accept</b> <glossary tag="command">command</glossary> when running a <glossary tag="server">server</glossary>, to accept <glossary tag="TCP">TCP</glossary> connections or <glossary tag="UDP">UDP</glossary> <glossary tag="datagram">datagrams</glossary> from other systems (or other <glossary tag="process">processes</glossary> on the same system).</p><p>Use the datagram option if you want to accept UDP datagrams.</p><p/><p><b>Parameters:</b></p><p>The <i>portNumber</i> is the <glossary tag="TCP">TCP</glossary> <glossary tag="port">port</glossary> number on which to accept connections.</p><p>The <i>callbackMessage</i> is the name of a <keyword tag="message box">message</keyword> to be sent when a connection is made or a <glossary tag="datagram">datagram</glossary> is received.</p><p></p><p><b>Comments:</b></p><p>When a connection is made or a datagram is received, the <b>accept</b> <glossary tag="command">command</glossary> creates a new <glossary tag="socket">socket</glossary> that can be used to communicate with the other system (or <glossary tag="process">process</glossary>). When using the <command tag="close socket">close socket</command>, <command tag="read from socket">read from socket</command>, or <command tag="write to socket">write to socket</command> <glossary tag="command">commands</glossary>, you can refer to this <glossary tag="socket">socket</glossary> with a socket identifier that looks like this:</p><p><i>host</i>:<i>port</i>[|<i>connectionID</i>]</p><p>where the <i>connectionID</i> is a number assigned by the <b>accept</b> <glossary tag="command">command</glossary>. (You only need to specify the connection number if there is more than one <glossary tag="socket">socket</glossary> connected to a particular <glossary tag="port">port</glossary> and <glossary tag="disabled">host</glossary>.)</p><p/><p>The <i>callbackMessage</i> is sent to the <glossary tag="object">object</glossary> whose <property tag="script">script</property> contains the <b>accept</b> <glossary tag="command">command</glossary>. Either one or two <glossary tag="parameter">parameters</glossary> are sent with this <keyword tag="message box">message</keyword>. The first <glossary tag="parameter">parameter</glossary> is the <glossary tag="IP address">IP address</glossary> of the system or <glossary tag="process">process</glossary> making the connection. If a <glossary tag="datagram">datagram</glossary> is being accepted, the second <glossary tag="parameter">parameter</glossary> is the contents of the <glossary tag="datagram">datagram</glossary>.</p><p/><p>For technical information about sockets, see RFC 147 at &lt;<u>http://www.ietf.org/rfc/rfc147.txt</u>&gt;.</p><p>For technical information about UDP datagrams, see RFC 768 at &lt;<u>http://www.ietf.org/rfc/rfc0768.txt</u>&gt;.</p><p>For technical information about the numbers used to designate standard ports, see the list of port numbers at &lt;<u>http://www.iana.org/assignments/port-numbers</u>&gt;<i>,</i> in particular the section entitled "Well Known Port Numbers".</p>
52-
</description>
2+
<legacy_id>1099</legacy_id>
3+
<name>accept</name>
4+
<type>command</type>
5+
6+
<syntax>
7+
<example>accept [datagram] connections on port <i>number</i> with message <i>callbackMessage</i></example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Accepts an internet connection and creates a <glossary tag="socket">socket</glossary> for that connection.</summary>
14+
15+
<examples>
16+
<example>accept connections on port 80 with message "connectionMade"</example>
17+
<example><font face="courier new" size="17">accept datagram connections on port 80 with message "</font>connectionMade<font face="courier new" size="17">"</font></example>
18+
<example><p>on mouseUp</p><p> accept connections on port 80 with message "connectionMade"</p><p>end mouseUp</p><p></p><p>on connectionMade pIPAddress</p><p> put "Connection made:" &amp;&amp; pIPAddress</p><p>end connectionMade</p></example>
19+
</examples>
20+
21+
<history>
22+
<introduced version="1.0">Added.</introduced>
23+
<deprecated version=""></deprecated>
24+
<removed version=""></removed>
25+
26+
<experimental version=""></experimental>
27+
<nonexperimental version=""></nonexperimental>
28+
</history>
29+
30+
<objects>
31+
</objects>
32+
33+
<platforms>
34+
<mac/>
35+
<windows/>
36+
<linux/>
37+
</platforms>
38+
39+
<classes>
40+
<desktop/>
41+
<server/>
42+
<web/>
43+
</classes>
44+
45+
<security>
46+
<network/>
47+
</security>
48+
49+
50+
<classification>
51+
<category>Networks &amp; Communication</category>
52+
</classification>
53+
54+
<references>
55+
<function tag="hostNameToAddress">hostNameToAddress Function</function>
56+
<function tag="openSockets">openSockets Function</function>
57+
<function tag="peerAddress">peerAddress Function</function>
58+
<function tag="hostAddress">hostAddress Function</function>
59+
<function tag="hostAddressToName">hostAddressToName Function</function>
60+
<function tag="hostName">hostName Function</function>
61+
<command tag="close socket">close socket Command</command>
62+
<command tag="open socket">open socket Command</command>
63+
<command tag="read from socket">read from socket Command</command>
64+
<command tag="write to socket">write to socket Command</command>
65+
<property tag="HTTPProxy">HTTPProxy Property</property>
66+
</references>
67+
68+
<description>Use the <b>accept</b> <glossary tag="command">command</glossary> when running a <glossary tag="server">server</glossary>, to accept <glossary tag="TCP">TCP</glossary> connections or <glossary tag="UDP">UDP</glossary> <glossary tag="datagram">datagrams</glossary> from other systems (or other <glossary tag="process">processes</glossary> on the same system).<p>Use the datagram option if you want to accept UDP datagrams.</p><p></p><p><b>Parameters:</b></p><p>The <i>portNumber</i> is the <glossary tag="TCP">TCP</glossary> <glossary tag="port">port</glossary> number on which to accept connections.</p><p>The <i>callbackMessage</i> is the name of a <keyword tag="message box">message</keyword> to be sent when a connection is made or a <glossary tag="datagram">datagram</glossary> is received.</p><p></p><p><b>Comments:</b></p><p>When a connection is made or a datagram is received, the <b>accept</b> <glossary tag="command">command</glossary> creates a new <glossary tag="socket">socket</glossary> that can be used to communicate with the other system (or <glossary tag="process">process</glossary>). When using the <command tag="close socket">close socket</command>, <command tag="read from socket">read from socket</command>, or <command tag="write to socket">write to socket</command> <glossary tag="command">commands</glossary>, you can refer to this <glossary tag="socket">socket</glossary> with a socket identifier that looks like this:</p><p><i>host</i>:<i>port</i>[|<i>connectionID</i>]</p><p>where the <i>connectionID</i> is a number assigned by the <b>accept</b> <glossary tag="command">command</glossary>. (You only need to specify the connection number if there is more than one <glossary tag="socket">socket</glossary> connected to a particular <glossary tag="port">port</glossary> and <glossary tag="disabled">host</glossary>.)</p><p></p><p>The <i>callbackMessage</i> is sent to the <glossary tag="object">object</glossary> whose <property tag="script">script</property> contains the <b>accept</b> <glossary tag="command">command</glossary>. Either one or two <glossary tag="parameter">parameters</glossary> are sent with this <keyword tag="message box">message</keyword>. The first <glossary tag="parameter">parameter</glossary> is the <glossary tag="IP address">IP address</glossary> of the system or <glossary tag="process">process</glossary> making the connection. If a <glossary tag="datagram">datagram</glossary> is being accepted, the second <glossary tag="parameter">parameter</glossary> is the contents of the <glossary tag="datagram">datagram</glossary>.</p><p></p><p>For technical information about sockets, see RFC 147 at &lt;<u>http://www.ietf.org/rfc/rfc147.txt</u>&gt;.</p><p>For technical information about UDP datagrams, see RFC 768 at &lt;<u>http://www.ietf.org/rfc/rfc0768.txt</u>&gt;.</p><p>For technical information about the numbers used to designate standard ports, see the list of port numbers at &lt;<u>http://www.iana.org/assignments/port-numbers</u>&gt;<i>,</i> in particular the section entitled "Well Known Port Numbers".</p></description>
5369
</doc>

0 commit comments

Comments
 (0)