Skip to content

Commit f960a54

Browse files
mwiedermwieder
mwieder
authored and
mwieder
committed
Merge branch 'release-6.0.1' into 64-bit
2 parents a0caaf1 + ebdec78 commit f960a54

File tree

86 files changed

+4818
-3146
lines changed

Some content is hidden

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

86 files changed

+4818
-3146
lines changed

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
# Specific files #
22
##################
3+
engine/private/
34
engine/src/hashedstrings.cpp
45
engine/src/encodederrors.cpp
56
engine/src/startupstack.cpp
67
engine/src/linuxstubs.cpp
8+
engine/include/revbuild.h
79
lcidlc/src/EncodedSupport.c
10+
IMarketBillingService.java
11+
crypt.cpp
12+
crypt.h
13+
deploysecurity_encrypted.cpp
14+
encryptedobjectstream.cpp
15+
encryptedobjectstream.h
16+
encryptedstack.cpp
17+
encryptedstack.h
18+
stacksecurity_encrypted.cpp
819

920
# Compiled source #
1021
###################
@@ -62,3 +73,4 @@ xcuserdata/
6273
#################
6374
_build/
6475
_cache/
76+
build/

‎LICENSE‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
Notes:
2+
3+
The majority of the code in the LiveCode Community edition is copyrighted
4+
by Runtime Revolution Ltd and has been released under the GPLv3.
5+
6+
However, the revBrowser component on Windows and secure sockets and
7+
encryption feature on Windows and Linux utilises code that is under a
8+
license incompatible with the GPL. Specifically revBrowser uses ATL and
9+
the secure sockets and encryption feature uses OpenSSL.
10+
11+
To this end, as a special exception to the terms and conditions of the
12+
GPL listed below, Runtime Revolution Ltd gives you explicit permission to
13+
combine its GPL code contained in LiveCode Community with ATL and
14+
OpenSSL. You may copy and distribute such a combination provided that
15+
you adhere to the terms and conditions of all of the GPL and licenses
16+
of the third-party code; in particular, you must include the source code
17+
of the entire combination insofar as the GPL requires distribution of
18+
source code.
19+
20+
Note that this exception is only needed and only has effect when
21+
distributing applications built with LiveCode Community which use
22+
revBrowser (on Windows) or OpenSSL (on Windows and Linux).
23+
24+
25+
126
GNU GENERAL PUBLIC LICENSE
227
Version 3, 29 June 2007
328

‎Makefile‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ LBITS := $(shell getconf LONG_BIT)
77
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
88
.PHONY: revsecurity libgif
99
.PHONY: kernel development standalone webruntime webplugin webplayer server
10+
.PHONY: kernel-standalone kernel-development kernel-server
1011
.PHONY: libireviam onrev-server
1112

1213
libexternal:
@@ -39,11 +40,20 @@ libcore:
3940
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
4041
$(MAKE) -C ./engine -f Makefile.kernel libkernel
4142

42-
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
43-
$(MAKE) -C ./engine -f Makefile.development engine
43+
kernel-standalone: kernel
44+
$(MAKE) -C ./engine -f Makefile.kernel-standalone libkernel-standalone
4445

45-
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity
46-
$(MAKE) -C ./engine -f Makefile.standalone standalone
46+
kernel-development: kernel
47+
$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
48+
49+
kernel-server:
50+
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
51+
52+
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
53+
$(MAKE) -C ./engine -f Makefile.development engine-community
54+
55+
standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone
56+
$(MAKE) -C ./engine -f Makefile.standalone standalone-community
4757

4858
#ifeq ($(LBITS),64)
4959
#standalone2: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity
@@ -58,8 +68,8 @@ standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecu
5868
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
5969
$(MAKE) -C ./engine -f Makefile.installer installer
6070

61-
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel revsecurity
62-
$(MAKE) -C ./engine -f Makefile.server server
71+
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-server revsecurity
72+
$(MAKE) -C ./engine -f Makefile.server server-community
6373

6474
###############################################################################
6575
# revPDFPrinter Targets

‎builder/builder.rev‎

72 Bytes
Binary file not shown.

‎builder/server_builder.rev‎

458 Bytes
Binary file not shown.

‎builder/tools_builder.rev‎

3.71 KB
Binary file not shown.

‎builder/tools_installer.rev‎

-1.01 KB
Binary file not shown.

‎builder/tools_installer_resources.rev‎

229 KB
Binary file not shown.

‎engine/Android.mk‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
44

55
TARGET_PLATFORM=android-8
66

7-
LOCAL_MODULE := revandroid
7+
LOCAL_MODULE := revandroid-kernel
88

99
LOCAL_ARM_MODE := arm
1010

@@ -41,14 +41,13 @@ LOCAL_SRC_FILES := $(addprefix src/,\
4141
mblad.cpp mblalert.cpp mblbusyindicator.cpp mblcalendar.cpp mblcontact.cpp mblcontrol.cpp \
4242
mbldc.cpp mbldialog.cpp mblflst.cpp mblmain.cpp mblnotification.cpp mblsensor.cpp \
4343
mblspec.cpp mblsound.cpp mblstack.cpp mblstore.cpp mbltextmessaging.cpp \
44-
mblandroid.cpp mblandroidalert.cpp mblandroidad.cpp mblandroidbrowser.cpp mblandroidbusyindicator.cpp \
44+
mblandroid.cpp mblandroidalert.cpp mblandroidbrowser.cpp mblandroidbusyindicator.cpp \
4545
mblandroidcalendar.cpp mblandroidcontact.cpp mblandroidcontext.cpp mblandroidcontrol.cpp \
4646
mblandroiddc.cpp mblandroiddialog.cpp mblandroidfont.cpp mblandroidfs.cpp mblandroidinput.cpp \
4747
mblandroidio.cpp mblandroidjava.cpp mblandroidmail.cpp mblandroidmisc.cpp mblandroidmm.cpp \
4848
mblandroidnetwork.cpp mblandroidnotification.cpp mblandroidorientation.cpp mblandroidplayer.cpp \
4949
mblandroidprocess.cpp mblandroidscroller.cpp mblandroidsensor.cpp mblandroidstore.cpp mblandroidsound.cpp \
50-
mblandroidtextlayout.cpp mblandroidtextmessaging.cpp mblandroidurl.cpp \
51-
stacksecurity.cpp)
50+
mblandroidtextlayout.cpp mblandroidtextmessaging.cpp mblandroidurl.cpp )
5251

5352
LOCAL_C_INCLUDES := \
5453
$(LOCAL_PATH)/include \
@@ -64,8 +63,25 @@ LOCAL_C_INCLUDES := \
6463
$(LOCAL_PATH)/../thirdparty/libskia/include/ports \
6564
$(LOCAL_PATH)/../thirdparty/libfreetype/include
6665

66+
include $(BUILD_STATIC_LIBRARY)
6767

68-
LOCAL_STATIC_LIBRARIES := libcore libjpeg libpcre libpng libgif libskia libfreetype
68+
#########
69+
70+
include $(CLEAR_VARS)
71+
72+
TARGET_PLATFORM=android-8
73+
74+
LOCAL_MODULE := revandroid-community
75+
76+
LOCAL_ARM_MODE := arm
77+
78+
LOCAL_SRC_FILES := $(addprefix src/,stacksecurity.cpp mblandroidad.cpp)
79+
80+
LOCAL_C_INCLUDES := \
81+
$(LOCAL_PATH)/include \
82+
$(LOCAL_PATH)/../libcore/include
83+
84+
LOCAL_STATIC_LIBRARIES := librevandroid-kernel libcore libjpeg libpcre libpng libgif libskia libfreetype
6985

7086
LOCAL_LDLIBS += -lz -lm -llog -ljnigraphics -lGLESv1_CM
7187

‎engine/Makefile‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
.PHONY: engine standalone runtime kernel newruntime server
1+
.PHONY: engine standalone runtime kernel newruntime server kernel-standalone kernel-development kernel-server
22

33
kernel:
44
$(MAKE) -f Makefile.kernel libkernel
55

6-
engine: kernel
7-
$(MAKE) -f Makefile.development engine
8-
if [ -e ../_build/linux/debug/engine ]; then cp ../_build/linux/debug/engine revolution.debug.x86; fi
9-
if [ -e ../_build/linux/release/engine ]; then cp ../_build/linux/release/engine revolution.release.x86; fi
6+
kernel-standalone:
7+
$(MAKE) -f Makefile.kernel-standalone libkernel-standalone
108

11-
standalone: kernel
12-
$(MAKE) -f Makefile.standalone standalone
9+
kernel-development:
10+
$(MAKE) -f Makefile.kernel-development libkernel-development
11+
12+
kernel-server:
13+
$(MAKE) -f Makefile.kernel-server libkernel-server
14+
15+
engine: kernel kernel-development
16+
$(MAKE) -f Makefile.development engine-community
17+
18+
standalone: kernel kernel-standalone
19+
$(MAKE) -f Makefile.standalone standalone-community
1320

1421
installer: kernel
1522
$(MAKE) -f Makefile.installer installer
1623

17-
server:
18-
$(MAKE) -f Makefile.server server
24+
server: kernel-server
25+
$(MAKE) -f Makefile.server server-community
1926

2027
clean:
2128
$(MAKE) -f Makefile.development clean

0 commit comments

Comments
 (0)