livecode · montegoulding · Apr 13, 2013 · Apr 16, 2013 · Apr 16, 2013 · Apr 16, 2013
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,15 @@ engine/src/startupstack.cpp
 engine/src/linuxstubs.cpp
 engine/include/revbuild.h
 lcidlc/src/EncodedSupport.c
+IMarketBillingService.java
+crypt.cpp
+crypt.h
+deploysecurity_encrypted.cpp
+encryptedobjectstream.cpp
+encryptedobjectstream.h
+encryptedstack.cpp
+encryptedstack.h
+stacksecurity_encrypted.cpp
 
 # Compiled source #
 ###################

diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@
 .PHONY: libexternal libexternalv1 libz libjpeg libpcre libpng libplugin libcore
 .PHONY: revsecurity libgif
 .PHONY: kernel development standalone webruntime webplugin webplayer server
+.PHONY: kernel-standalone kernel-development kernel-server
 .PHONY: libireviam onrev-server
 
 libexternal:
@@ -37,17 +38,26 @@ libcore:
 kernel: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore
 	$(MAKE) -C ./engine -f Makefile.kernel libkernel
 
-development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
-	$(MAKE) -C ./engine -f Makefile.development engine
+kernel-standalone: kernel
+	$(MAKE) -C ./engine -f Makefile.kernel-standalone libkernel-standalone
 
-standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity
-	$(MAKE) -C ./engine -f Makefile.standalone standalone
+kernel-development: kernel
+	$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
+
+kernel-server:
+	$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
+
+development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
+	$(MAKE) -C ./engine -f Makefile.development engine-community
+
+standalone: libz libgif libjpeg libpcre libpng libopenssl libcore kernel revsecurity kernel-standalone
+	$(MAKE) -C ./engine -f Makefile.standalone standalone-community
 
 installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel
 	$(MAKE) -C ./engine -f Makefile.installer installer
 
-server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel revsecurity
-	$(MAKE) -C ./engine -f Makefile.server server
+server: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-server revsecurity
+	$(MAKE) -C ./engine -f Makefile.server server-community
 
 ###############################################################################
 # revPDFPrinter Targets

diff --git a/engine/Makefile b/engine/Makefile
@@ -1,21 +1,28 @@
-.PHONY: engine standalone runtime kernel newruntime server
+.PHONY: engine standalone runtime kernel newruntime server kernel-standalone kernel-development kernel-server
 
 kernel:
 	$(MAKE) -f Makefile.kernel libkernel
 
-engine: kernel
-	$(MAKE) -f Makefile.development engine
-	if [ -e ../_build/linux/debug/engine ]; then cp ../_build/linux/debug/engine revolution.debug.x86; fi
-	if [ -e ../_build/linux/release/engine ]; then cp ../_build/linux/release/engine revolution.release.x86; fi
+kernel-standalone:
+	$(MAKE) -f Makefile.kernel-standalone libkernel-standalone
 
-standalone: kernel
-	$(MAKE) -f Makefile.standalone standalone
+kernel-development:
+	$(MAKE) -f Makefile.kernel-development libkernel-development
+
+kernel-server:
+	$(MAKE) -f Makefile.kernel-server libkernel-server
+
+engine: kernel kernel-development
+	$(MAKE) -f Makefile.development engine-community
+
+standalone: kernel kernel-standalone
+	$(MAKE) -f Makefile.standalone standalone-community
 
 installer: kernel
 	$(MAKE) -f Makefile.installer installer
 
-server:
-	$(MAKE) -f Makefile.server server
+server: kernel-server
+	$(MAKE) -f Makefile.server server-community
 
 clean:
 	$(MAKE) -f Makefile.development clean

diff --git a/engine/Makefile.common b/engine/Makefile.common
@@ -1,8 +1,5 @@
 SOURCES= \
 	$(MODE_SOURCES)
-
-SOURCE_DIRS=\
-	unix
 
 CUSTOM_DEFINES=\
 	LINUX \
@@ -15,9 +12,9 @@ CUSTOM_INCLUDES=\
 	./src \
  	$(MODE_INCLUDES)
 
-CUSTOM_DEPS=libkernel.a libcore.a libpng.a libpcre.a libjpeg.a
+CUSTOM_DEPS= libkernel.a libcore.a libpng.a libpcre.a libjpeg.a $(MODE_DEPS) 
 
-CUSTOM_LIBS=kernel core z gif png pcre jpeg openssl $(MODE_LIBS)
+CUSTOM_LIBS=$(MODE_LIBS) kernel core z gif png pcre jpeg openssl
 CUSTOM_STATIC_LIBS=stdc++ $(MODE_STATIC_LIBS)
 CUSTOM_DYNAMIC_LIBS=dl X11 m Xext pthread $(MODE_DYNAMIC_LIBS)
 
@@ -29,4 +26,4 @@ CUSTOM_CCFLAGS=\
 CUSTOM_LDFLAGS=-static-libgcc \
 	$(MODE_LDFLAGS) -Wl,-rpath,\$$ORIGIN
 
-include ../rules/application.linux.makefile
+include $(dir $(lastword $(MAKEFILE_LIST)))/../rules/application.linux.makefile
diff --git a/engine/Makefile.development b/engine/Makefile.development
@@ -1,26 +1,16 @@
-NAME=engine
+NAME=engine-community
 TYPE=application
 
 MODE_SOURCES= \
-	ide.cpp internal_development.cpp lextable.cpp mode_development.cpp \
-	startupstack.cpp deploy.cpp deploy_linux.cpp deploy_windows.cpp \
-	deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
-	deploy_dmg.cpp \
+	stacksecurity.cpp \
 	deploysecurity.cpp \
-	bsdiff_build.cpp encodederrors.cpp
+	startupstack.cpp
 
-MODE_DEFINES=\
-	MODE_DEVELOPMENT
+MODE_DEPS=libkernel-development.a
+
+MODE_LIBS=kernel-development
 
 startupstack.cpp: src/Environment.rev
 	../prebuilt/bin/Revolution.lnx "./compress_data.rev"  "./src/Environment.rev" "./src/startupstack.cpp" "MCstartupstack"
 
-hashedstrings.cpp: src/lextable.cpp
-	../prebuilt/bin/Revolution.lnx "./hash_strings.rev" "./src/lextable.cpp" "./src/hashedstrings.cpp" "../prebuilt/bin/perfect.lnx"
-
-encodederrors.cpp: src/executionerrors.h src/parseerrors.h
-	../prebuilt/bin/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
-
-engine: hashedstrings.cpp
-
 include Makefile.common
diff --git a/engine/Makefile.kernel b/engine/Makefile.kernel
@@ -45,20 +45,12 @@ SOURCES=\
 	redraw.cpp tilecache.cpp tilecachesw.cpp syslnxregion.cpp fieldstyledtext.cpp paragrafattr.cpp \
 	fonttable.cpp fieldrtf.cpp fieldhtml.cpp stackcache.cpp
 
-CUSTOM_DEFINES=\
-	LINUX \
-	X11 TARGET_PLATFORM_LINUX TARGET_PLATFORM_POSIX \
-	GTKTHEME \
-	HAVE___THREAD
-
-CUSTOM_INCLUDES=\
-	./src
-
-CUSTOM_CCFLAGS=\
-	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \
-	-fmessage-length=0
-
 linuxstubs.cpp: src/linux.stubs
 	../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp
 
-include ../rules/archive.linux.makefile
+include/revbuild.h: include/revbuild.h.in
+	../prebuilt/bin/Revolution.lnx "./encode_version.rev" "./"
+
+../_cache/linux/$(MODE)/$(NAME)/mcstring.o: include/revbuild.h
+
+include Makefile.kernel-common
diff --git a/engine/Makefile.kernel-common b/engine/Makefile.kernel-common
@@ -0,0 +1,18 @@
+
+CUSTOM_DEFINES=\
+	LINUX \
+	X11 TARGET_PLATFORM_LINUX TARGET_PLATFORM_POSIX \
+	GTKTHEME \
+	HAVE___THREAD \
+	$(KERNEL_DEFINES)
+
+CUSTOM_INCLUDES=\
+	./src \
+	$(KERNEL_INCLUDES)
+
+CUSTOM_CCFLAGS=\
+	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \
+	-fmessage-length=0 \
+	$(KERNEL_CCFLAGS)
+
+include ../rules/archive.linux.makefile
diff --git a/engine/Makefile.kernel-development b/engine/Makefile.kernel-development
@@ -0,0 +1,21 @@
+NAME=libkernel-development
+TYPE=archive
+
+SOURCES= \
+	ide.cpp internal_development.cpp lextable.cpp mode_development.cpp \
+	deploy.cpp deploy_linux.cpp deploy_windows.cpp \
+	deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
+	deploy_dmg.cpp bsdiff_build.cpp encodederrors.cpp
+
+KERNEL_DEFINES=\
+	MODE_DEVELOPMENT
+
+src/hashedstrings.cpp: src/lextable.cpp
+	../prebuilt/bin/Revolution.lnx "./hash_strings.rev" "./src/lextable.cpp" "./src/hashedstrings.cpp" "../prebuilt/bin/perfect.lnx"
+
+encodederrors.cpp: src/executionerrors.h src/parseerrors.h
+	../prebuilt/bin/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
+
+../_cache/linux/$(MODE)/$(NAME)/ide.o: src/hashedstrings.cpp
+
+include Makefile.kernel-common
diff --git a/engine/Makefile.kernel-server b/engine/Makefile.kernel-server
@@ -0,0 +1,66 @@
+NAME=libkernel-server
+TYPE=archive
+
+SOURCES=\
+	aclip.cpp block.cpp button.cpp buttondraw.cpp card.cpp cardlst.cpp \
+	cdata.cpp chunk.cpp cmds.cpp cmdsc.cpp cmdse.cpp cmdsf.cpp \
+	cmdsm.cpp cmdsp.cpp cmdss.cpp constant.cpp control.cpp cpalette.cpp \
+	date.cpp debug.cpp dispatch.cpp dllst.cpp \
+	execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
+	font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
+	handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
+	igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
+	image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
+	imagebitmap.cpp ipng.cpp \
+	iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
+	itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
+	mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
+	object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
+	property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
+	scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
+	stack3.cpp stackcache.cpp stacklst.cpp \
+	statemnt.cpp styledtext.cpp tooltip.cpp \
+	transfer.cpp uidc.cpp gradient.cpp edittool.cpp \
+	undolst.cpp util.cpp variable.cpp vclip.cpp visual.cpp \
+	eps.cpp mcssl.cpp \
+	answer.cpp ask.cpp external.cpp player.cpp surface.cpp \
+	combiners.cpp path.cpp metacontext.cpp \
+	printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
+	pathprocess.cpp \
+	contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
+	menuparse.cpp parentscript.cpp securemode.cpp \
+	bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
+	externalv0.cpp externalv1.cpp lextable.cpp \
+	objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
+	sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp \
+	srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvflst.cpp srvposix.cpp srvdebug.cpp \
+	srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp \
+	eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
+	fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp
+
+SOURCE_DIRS=
+
+CUSTOM_OVERRIDE_DEFINES=1
+
+CUSTOM_DEFINES=\
+	_SERVER _LINUX_SERVER __LITTLE_ENDIAN__
+
+CUSTOM_INCLUDES=\
+	./src
+
+CUSTOM_CCFLAGS=\
+	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
+	-fmessage-length=0 
+
+include/revbuild.h: include/revbuild.h.in
+	../prebuilt/bin/Revolution.lnx "./encode_version.rev" "./"
+
+linuxstubs.cpp: src/linux.stubs
+	../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
+
+encodederrors.cpp: src/executionerrors.h src/parseerrors.h
+	../prebuilt/bin/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
+
+../_cache/linux/$(MODE)/$(NAME)/mcstring.o: include/revbuild.h
+
+include ../rules/archive.linux.makefile
diff --git a/engine/Makefile.kernel-standalone b/engine/Makefile.kernel-standalone
@@ -0,0 +1,10 @@
+NAME=libkernel-standalone
+TYPE=archive
+
+SOURCES= \
+	lextable.cpp mode_standalone.cpp
+
+KERNEL_DEFINES=\
+	MODE_STANDALONE
+
+include Makefile.kernel-common
diff --git a/engine/Makefile.server b/engine/Makefile.server
@@ -1,43 +1,8 @@
-NAME=server
+NAME=server-community
 TYPE=application
 
 SOURCES=\
-	aclip.cpp block.cpp button.cpp buttondraw.cpp card.cpp cardlst.cpp \
-	cdata.cpp chunk.cpp cmds.cpp cmdsc.cpp cmdse.cpp cmdsf.cpp \
-	cmdsm.cpp cmdsp.cpp cmdss.cpp constant.cpp control.cpp cpalette.cpp \
-	date.cpp debug.cpp dispatch.cpp dllst.cpp \
-	execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
-	font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
-	handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
-	igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
-	image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
-	imagebitmap.cpp ipng.cpp \
-	iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
-	itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
-	mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
-	object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
-	property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
-	scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
-	stack3.cpp stackcache.cpp stacklst.cpp \
-	stacksecurity.cpp \
-	statemnt.cpp styledtext.cpp tooltip.cpp \
-	transfer.cpp uidc.cpp gradient.cpp edittool.cpp \
-	undolst.cpp util.cpp variable.cpp vclip.cpp visual.cpp \
-	eps.cpp mcssl.cpp \
-	answer.cpp ask.cpp external.cpp player.cpp surface.cpp \
-	combiners.cpp path.cpp metacontext.cpp \
-	printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
-	pathprocess.cpp \
-	contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
-	menuparse.cpp parentscript.cpp securemode.cpp \
-	bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
-	externalv0.cpp externalv1.cpp lextable.cpp \
-	objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
-	sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp \
-	srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvflst.cpp srvposix.cpp srvdebug.cpp \
-	srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp \
-	eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
-	fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp
+	stacksecurity.cpp
 
 SOURCE_DIRS=
 
@@ -47,24 +12,19 @@ CUSTOM_DEFINES=\
 	_SERVER _LINUX_SERVER __LITTLE_ENDIAN__
 
 CUSTOM_INCLUDES=\
-	./src \
-	$(HOME)/revlibs/prefix/include
+	./src
 
-CUSTOM_LIBS=pcre png jpeg z core gif
+CUSTOM_DEPS=libkernel-server.a
+
+CUSTOM_LIBS=pcre png jpeg z core gif kernel-server
 CUSTOM_STATIC_LIBS=curl ssl crypto stdc++ rt
 CUSTOM_DYNAMIC_LIBS=dl m
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
 	-fmessage-length=0 
 
-CUSTOM_LDFLAGS=-L$(HOME)/revlibs/prefix/lib -export-dynamic -Wl,-x
-
-linuxstubs.cpp: src/linux.stubs
-	../tools/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
-
-encodederrors.cpp: src/executionerrors.h src/parseerrors.h
-	../tools/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
+CUSTOM_LDFLAGS=-export-dynamic -Wl,-x
 
 include ../rules/application.linux.makefile
 

diff --git a/engine/Makefile.standalone b/engine/Makefile.standalone
@@ -1,12 +1,13 @@
-NAME=standalone
+NAME=standalone-community
 TYPE=application
 
 MODE_SOURCES= \
-	lextable.cpp mode_standalone.cpp
+	stacksecurity.cpp
+
+MODE_DEPS=libkernel-standalone.a
+
+MODE_LIBS=kernel-standalone
 
-MODE_DEFINES=\
-	MODE_STANDALONE
-
 MODE_LDFLAGS=\
 	-Wl,--script=standalone.link