Skip to content

Commit dd8f764

Browse files
livecodesebastienlivecodesebastien
committed
Merge branch 'refactor-syntax_unicode' into refactor-syntax_unicode_shims
Conflicts: engine/src/answer.cpp engine/src/ask.cpp engine/src/chunk.cpp engine/src/chunk.h engine/src/cmds.cpp engine/src/cmdsc.cpp engine/src/cmdse.cpp engine/src/cmdsf.cpp engine/src/executionerrors.h engine/src/property.cpp engine/src/variable.cpp
2 parents 7b6cffe + ceabb11 commit dd8f764

File tree

3,176 files changed

+157519
-26723
lines changed

Some content is hidden

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

3,176 files changed

+157519
-26723
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*.gitattributes text
1313
*.mk text
1414
*.lc text
15+
*.xml text
16+
*.md text
1517

1618
# Declare files that will always have CRLF line endings on checkout.
1719
*.sln text eol=crlf

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ engine/src/startupstack.cpp
77
engine/src/linuxstubs.cpp
88
engine/include/revbuild.h
99
lcidlc/src/EncodedSupport.c
10+
lcidlc/src/EncodedJavaSupport.c
11+
*/derived_src/*
1012
IMarketBillingService.java
1113
crypt.cpp
1214
crypt.h
@@ -66,6 +68,8 @@ Thumbs.db
6668
#########################
6769
*.pbxuser
6870
*.perspectivev3
71+
*.xcworkspace
72+
*.xcworkspacedata
6973
xcuserdata/
7074
*.vcproj.*.user
7175
*.ncb
@@ -80,3 +84,7 @@ xcuserdata/
8084
_build/
8185
_cache/
8286
build/
87+
88+
# SDKs #
89+
#################
90+
sdks/

‎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: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Engine Targets
33

44
.PHONY: libopenssl liburlcache libstubs libfoundation
5-
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
5+
.PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin 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,20 @@ libgif:
3232
libopenssl:
3333
$(MAKE) -C ./thirdparty/libopenssl libopenssl
3434

35-
libcore:
36-
$(MAKE) -C ./libcore libcore
35+
libskia:
36+
$(MAKE) -C ./thirdparty/libskia libskia
3737

3838
libfoundation:
3939
$(MAKE) -C ./libfoundation libfoundation
4040

41-
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
41+
revsecurity:
42+
$(MAKE) -C ./thirdparty/libopenssl -f Makefile.revsecurity revsecurity
43+
44+
libgraphics: libskia
45+
$(MAKE) -C ./libgraphics libgraphics
46+
47+
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation libgraphics
48+
4249
$(MAKE) -C ./engine -f Makefile.kernel libkernel
4350

4451
kernel-standalone: kernel
@@ -50,13 +57,14 @@ kernel-development: kernel
5057
kernel-server:
5158
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
5259

53-
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-development
60+
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-development revsecurity
5461
$(MAKE) -C ./engine -f Makefile.development engine-community
5562

56-
standalone: libz libgif libjpeg libpcre libpng libopenssl libfoundation kernel revsecurity kernel-standalone
63+
standalone: libz libgif libjpeg libpcre libpng libopenssl libfoundation kernel revsecurity kernel-standalone revsecurity
5764
$(MAKE) -C ./engine -f Makefile.standalone standalone-community
5865

59-
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel
66+
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel revsecurity
67+
6068
$(MAKE) -C ./engine -f Makefile.installer installer
6169

6270
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-server revsecurity
@@ -70,7 +78,7 @@ server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation
7078
libcairopdf:
7179
$(MAKE) -C ./thirdparty/libcairo libcairopdf
7280

73-
revpdfprinter: libcairopdf
81+
revpdfprinter: libcairopdf libcore
7482
$(MAKE) -C ./revpdfprinter revpdfprinter
7583

7684
###############################################################################
@@ -97,7 +105,7 @@ libiodbc:
97105
dbpostgresql: libpq
98106
$(MAKE) -C ./revdb dbpostgresql
99107

100-
dbmysql: libmysql libz
108+
dbmysql: libmysql libz libopenssl
101109
$(MAKE) -C ./revdb dbmysql
102110

103111
dbsqlite: libsqlite libexternal
@@ -131,15 +139,18 @@ server-revdb: libexternal
131139
###############################################################################
132140
# revXML Targets
133141

134-
.PHONY: libxml revxml server-revxml
142+
.PHONY: libxml libxslt revxml server-revxml
135143

136144
libxml:
137145
$(MAKE) -C ./thirdparty/libxml libxml
138146

139-
revxml: libxml libexternal
147+
libxslt:
148+
$(MAKE) -C ./thirdparty/libxslt libxslt
149+
150+
revxml: libxml libxslt libexternal
140151
$(MAKE) -C ./revxml revxml
141152

142-
server-revxml: libxml libexternal
153+
server-revxml: libxml libxslt libexternal
143154
$(MAKE) -C ./revxml server-revxml
144155

145156
###############################################################################
@@ -168,11 +179,14 @@ revandroid: libexternalv1
168179
# All Targets
169180

170181
.PHONY: all clean
182+
.DEFAULT_GOAL := all
171183

172184
all: revzip server-revzip
173185
all: revxml server-revxml
174186
all: revpdfprinter revandroid
175187
all: revdb dbodbc dbsqlite dbmysql dbpostgresql
176188
all: server-revdb server-dbodbc server-dbsqlite server-dbmysql server-dbpostgresql
177189
all: development standalone installer server
178-
#
190+
191+
clean:
192+
@rm -r _build/linux _cache/linux

0 commit comments

Comments
 (0)