Skip to content

Commit 7ff10a4

Browse files
author
Ali Lloyd
committed
Merge commit '783dcc5463145873cb3318d63696238daa3fd47a' into refactor-syntax_unicode_with_develop_again
Conflicts: Makefile engine/Android.mk engine/Makefile.common engine/Makefile.kernel engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/kernel.vcproj engine/src/aclip.cpp engine/src/ans.h engine/src/answer.cpp engine/src/ask.cpp engine/src/button.cpp engine/src/card.cpp engine/src/chunk.cpp engine/src/cmds.cpp engine/src/cmds.h engine/src/cmdsc.cpp engine/src/cmdse.cpp engine/src/cmdsf.cpp engine/src/cmdsm.cpp engine/src/cmdsp.cpp engine/src/cmdss.cpp engine/src/contextscalewrapper.cpp engine/src/control.cpp engine/src/cpalette.cpp engine/src/date.cpp engine/src/dispatch.cpp engine/src/eps.cpp engine/src/execpt.cpp engine/src/execpt.h engine/src/executionerrors.h engine/src/field.cpp engine/src/fieldf.cpp engine/src/filedefs.h engine/src/funcs.cpp engine/src/funcs.h engine/src/funcsm.cpp engine/src/globals.cpp engine/src/globals.h engine/src/gradient.cpp engine/src/graphicscontext.h engine/src/group.cpp engine/src/hc.cpp engine/src/ibmp.cpp engine/src/ifile.cpp engine/src/image.cpp engine/src/image.h engine/src/image_rep.h engine/src/image_rep_encoded.cpp engine/src/image_rep_transformed.cpp engine/src/internal_development.cpp engine/src/ipng.cpp engine/src/irle.cpp engine/src/lnxcontext.cpp engine/src/lnxcontext.h engine/src/lnxdc.cpp engine/src/lnxdc.h engine/src/lnxdclnx.cpp engine/src/lnxdcs.cpp engine/src/lnxflst.cpp engine/src/lnxspec.cpp engine/src/mblactivityindicator.cpp engine/src/mblad.cpp engine/src/mblalert.cpp engine/src/mblandroidalert.cpp engine/src/mblandroidbusyindicator.cpp engine/src/mblandroidcalendar.cpp engine/src/mblandroidcontext.cpp engine/src/mblandroidcontext.h engine/src/mblandroidcontrol.cpp engine/src/mblandroiddc.cpp engine/src/mblandroidfont.cpp engine/src/mblandroidmail.cpp engine/src/mblandroidmisc.cpp engine/src/mblandroidnotification.cpp engine/src/mblandroidorientation.cpp engine/src/mblandroidstore.cpp engine/src/mblbusyindicator.cpp engine/src/mblcalendar.cpp engine/src/mblcamera.cpp engine/src/mblcontact.cpp engine/src/mblcontrol.cpp engine/src/mbldc.cpp engine/src/mbldc.h engine/src/mbldialog.cpp engine/src/mbliphonealert.mm engine/src/mbliphonecontext.cpp engine/src/mbliphonecontext.h engine/src/mbliphonedc.mm engine/src/mbliphoneembedded.mm engine/src/mbliphoneextra.mm engine/src/mbliphonefs.mm engine/src/mbliphonelocation.mm engine/src/mbliphonemail.mm engine/src/mbliphonenotification.mm engine/src/mbliphoneplayer.mm engine/src/mbliphonestore.mm engine/src/mblnotification.cpp engine/src/mblsensor.cpp engine/src/mblsound.cpp engine/src/mblspec.cpp engine/src/mblstore.cpp engine/src/mbltextmessaging.cpp engine/src/mcssl.cpp engine/src/mcssl.h engine/src/metacontext.cpp engine/src/mode_standalone.cpp engine/src/object.cpp engine/src/object.h engine/src/objectprops.cpp engine/src/operator.cpp engine/src/osxcisupport.mm engine/src/osxcontext.cpp engine/src/osxcontext.h engine/src/osxdc.cpp engine/src/osxdc.h engine/src/osxdcs.cpp engine/src/osxmisc.cpp engine/src/osxsnapshot.mm engine/src/osxspec.cpp engine/src/osxtheme.cpp engine/src/osxtransfer.h engine/src/osxtransfer.mm engine/src/paragraf.h engine/src/parsedef.h engine/src/player.cpp engine/src/player.h engine/src/property.cpp engine/src/props.cpp engine/src/redraw.cpp engine/src/regex.cpp engine/src/regex.h engine/src/srvsession.cpp engine/src/stack.cpp engine/src/stack.h engine/src/stack3.cpp engine/src/sysspec.cpp engine/src/system.h engine/src/transfer.cpp engine/src/typedefs.h engine/src/uidc.cpp engine/src/uidc.h engine/src/util.cpp engine/src/util.h engine/src/variablearray.cpp engine/src/variablevalue.cpp engine/src/w32ans.cpp engine/src/w32dc.cpp engine/src/w32dc.h engine/src/w32dcs.cpp engine/src/w32flst.cpp engine/src/w32image.cpp engine/src/w32printer.cpp engine/src/w32transfer.cpp engine/src/w32transfer.h revvideograbber/revvideograbber.xcodeproj/project.pbxproj rules/Global Mobile.xcconfig rules/Global Server.vsprops rules/Global.vsprops rules/Global.xcconfig rules/GlobalEH.vsprops rules/common.linux.makefile stage-server.sln stage.sln
2 parents 96b8d80 + 783dcc5 commit 7ff10a4

File tree

3,090 files changed

+151549
-16991
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,090 files changed

+151549
-16991
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
@@ -79,3 +83,7 @@ xcuserdata/
7983
_build/
8084
_cache/
8185
build/
86+
87+
# SDKs #
88+
#################
89+
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: 28 additions & 11 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 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,23 @@ 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
libfoundation:
3942
$(MAKE) -C ./libfoundation libfoundation
4043

41-
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
44+
revsecurity:
45+
$(MAKE) -C ./thirdparty/libopenssl -f Makefile.revsecurity revsecurity
46+
47+
libgraphics: libskia
48+
$(MAKE) -C ./libgraphics libgraphics
49+
50+
kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore libgraphics
51+
4252
$(MAKE) -C ./engine -f Makefile.kernel libkernel
4353

4454
kernel-standalone: kernel
@@ -50,13 +60,14 @@ kernel-development: kernel
5060
kernel-server:
5161
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
5262

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

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

59-
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel
69+
installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel revsecurity
70+
6071
$(MAKE) -C ./engine -f Makefile.installer installer
6172

6273
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-server revsecurity
@@ -70,7 +81,7 @@ server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation
7081
libcairopdf:
7182
$(MAKE) -C ./thirdparty/libcairo libcairopdf
7283

73-
revpdfprinter: libcairopdf
84+
revpdfprinter: libcairopdf libcore
7485
$(MAKE) -C ./revpdfprinter revpdfprinter
7586

7687
###############################################################################
@@ -97,7 +108,7 @@ libiodbc:
97108
dbpostgresql: libpq
98109
$(MAKE) -C ./revdb dbpostgresql
99110

100-
dbmysql: libmysql libz
111+
dbmysql: libmysql libz libopenssl
101112
$(MAKE) -C ./revdb dbmysql
102113

103114
dbsqlite: libsqlite libexternal
@@ -131,15 +142,18 @@ server-revdb: libexternal
131142
###############################################################################
132143
# revXML Targets
133144

134-
.PHONY: libxml revxml server-revxml
145+
.PHONY: libxml libxslt revxml server-revxml
135146

136147
libxml:
137148
$(MAKE) -C ./thirdparty/libxml libxml
138149

139-
revxml: libxml libexternal
150+
libxslt:
151+
$(MAKE) -C ./thirdparty/libxslt libxslt
152+
153+
revxml: libxml libxslt libexternal
140154
$(MAKE) -C ./revxml revxml
141155

142-
server-revxml: libxml libexternal
156+
server-revxml: libxml libxslt libexternal
143157
$(MAKE) -C ./revxml server-revxml
144158

145159
###############################################################################
@@ -168,11 +182,14 @@ revandroid: libexternalv1
168182
# All Targets
169183

170184
.PHONY: all clean
185+
.DEFAULT_GOAL := all
171186

172187
all: revzip server-revzip
173188
all: revxml server-revxml
174189
all: revpdfprinter revandroid
175190
all: revdb dbodbc dbsqlite dbmysql dbpostgresql
176191
all: server-revdb server-dbodbc server-dbsqlite server-dbmysql server-dbpostgresql
177192
all: development standalone installer server
178-
#
193+
194+
clean:
195+
@rm -r _build/linux _cache/linux

0 commit comments

Comments
 (0)