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

Commit 7318c98

Browse files
peter-bpeter-b
authored
Merge branch 'develop' into bugfix-19141
2 parents 93a6432 + c22616e commit 7318c98

File tree

465 files changed

+21915
-9314
lines changed

Some content is hidden

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

465 files changed

+21915
-9314
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ prebuilt/lib
121121
prebuilt/build
122122
prebuilt/packaged
123123
prebuilt/fetched
124+
prebuilt/unpacked
124125

125126
# Stamp files and generated C files
126127
###################################

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ env:
3434
- secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
3535
- CXX_STD: "c++11"
3636

37+
jdk:
38+
- openjdk6
39+
3740
# Install any required tools
3841
before_install:
3942
- |
@@ -55,6 +58,7 @@ script: |
5558
BUILD_PLATFORM=linux
5659
CHECK_COMMAND=xvfb-run
5760
LICENSE_DIR="${HOME}/.runrev/licenses"
61+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${JAVA_HOME}/jre/lib/amd64/server"
5862
;;
5963
osx)
6064
BUILD_PLATFORM=mac
@@ -63,6 +67,7 @@ script: |
6367
export XCODE_TARGET_SDK=macosx10.11
6468
export XCODEBUILD="set -o pipefail && xcodebuild"
6569
export XCODEBUILD_FILTER="| xcpretty"
70+
export JAVA_HOME=$(/usr/libexec/java_home)
6671
;;
6772
esac
6873

‎Installer/package.txt‎

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -421,18 +421,21 @@ component Toolchain.MacOSX
421421
into [[ToolsFolder]]/Toolchain place
422422
executable macosx:lc-compile as lc-compile
423423
executable macosx:lc-run as lc-run
424+
executable macosx:lc-compile-ffi-java as lc-compile-ffi-java
424425
rfolder macosx:modules
425426

426427
component Toolchain.Windows
427428
into [[ToolsFolder]]/Toolchain place
428429
executable windows:lc-compile.exe as lc-compile.exe
429430
executable windows:lc-run.exe as lc-run.exe
431+
executable windows:lc-compile-ffi-java.exe as lc-compile-ffi-java.exe
430432
rfolder windows:modules
431433

432434
component Toolchain.Linux
433435
into [[ToolsFolder]]/Toolchain place
434436
executable linux-[[TargetArchitecture]]:lc-compile as lc-compile
435437
executable linux-[[TargetArchitecture]]:lc-run as lc-run
438+
executable linux-[[TargetArchitecture]]:lc-compile-ffi-java as lc-compile-ffi-java
436439
rfolder linux-[[TargetArchitecture]]:modules
437440

438441
////////////////////////////////////////////////////////////////////////////////
@@ -539,6 +542,7 @@ component Runtime.Android
539542
file android:Manifest.xml
540543
file android:livecode_inputcontrol.xml
541544
file android:notify_icon.png
545+
file android:nfc_tech_filter.xml
542546
executable android:Standalone[[BaseEditionTagUpper]] as Standalone
543547
executable android:RevZip
544548
executable android:RevXml
@@ -550,45 +554,15 @@ component Runtime.Android
550554
//////////
551555

552556
component Runtime.iOS
553-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-6_1" place
554-
executable ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
555-
executable ios:iphonesimulator6.1/revsecurity.ios-extension as RevSecurity
556-
executable ios:iphonesimulator6.1/revpdfprinter.ios-extension as RevPdfPrinter
557-
executable ios:iphonesimulator6.1/revzip.ios-extension as RevZip
558-
executable ios:iphonesimulator6.1/revxml.ios-extension as RevXml
559-
executable ios:iphonesimulator6.1/revdb.ios-extension as RevDb
560-
executable ios:iphonesimulator6.1/dbsqlite.ios-extension as DbSqlite
561-
executable ios:iphonesimulator6.1/dbmysql.ios-extension as DbMysql
562-
file ios:iphonesimulator6.1/mobile-template.plist as "Settings.plist"
563-
file ios:iphonesimulator6.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
564-
file ios:iphonesimulator6.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
565-
file ios:iphonesimulator6.1/mobile-disable-ats-template.plist as "DisableATS.plist"
566-
file ios:iphonesimulator6.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
567-
file ios:iphonesimulator6.1/fontmap as "fontmap"
568-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-7_1" place
569-
executable ios:iphonesimulator7.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
570-
executable ios:iphonesimulator7.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
571-
executable ios:iphonesimulator7.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
572-
executable ios:iphonesimulator7.1/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
573-
executable ios:iphonesimulator7.1/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
574-
executable ios:iphonesimulator7.1/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
575-
executable ios:iphonesimulator7.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
576-
executable ios:iphonesimulator7.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
577-
file ios:iphonesimulator7.1/mobile-template.plist as "Settings.plist"
578-
file ios:iphonesimulator7.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
579-
file ios:iphonesimulator7.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
580-
file ios:iphonesimulator7.1/mobile-disable-ats-template.plist as "DisableATS.plist"
581-
file ios:iphonesimulator7.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
582-
file ios:iphonesimulator7.1/fontmap as "fontmap"
583557
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_2" place
584-
executable ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
585-
executable ios:iphonesimulator8.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
586-
executable ios:iphonesimulator8.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
587-
executable ios:iphonesimulator8.2/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
588-
executable ios:iphonesimulator8.2/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
589-
executable ios:iphonesimulator8.2/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
590-
executable ios:iphonesimulator8.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
591-
executable ios:iphonesimulator8.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
558+
executable ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
559+
executable ios:iphonesimulator8.2/revsecurity.ios-extension as RevSecurity
560+
executable ios:iphonesimulator8.2/revpdfprinter.ios-extension as RevPdfPrinter
561+
executable ios:iphonesimulator8.2/revzip.ios-extension as RevZip
562+
executable ios:iphonesimulator8.2/revxml.ios-extension as RevXml
563+
executable ios:iphonesimulator8.2/revdb.ios-extension as RevDb
564+
executable ios:iphonesimulator8.2/dbsqlite.ios-extension as DbSqlite
565+
executable ios:iphonesimulator8.2/dbmysql.ios-extension as DbMysql
592566
file ios:iphonesimulator8.2/mobile-template.plist as "Settings.plist"
593567
file ios:iphonesimulator8.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
594568
file ios:iphonesimulator8.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
@@ -689,13 +663,11 @@ component Externals.Windows
689663
executable windows:revxml.dll
690664
executable windows:revbrowser.dll
691665
executable windows:revzip.dll
692-
executable windows:revfont.dll
693666
declare external "Speech" using revspeech.dll
694667
declare external "Video Grabber" using revvideograbber.dll
695668
declare external "XML" using revxml.dll
696669
declare external "Browser" using revbrowser.dll
697670
declare external "Revolution Zip" using revzip.dll
698-
declare external "Font Support" using revfont.dll
699671

700672
//////////
701673

@@ -705,12 +677,10 @@ component Externals.MacOSX
705677
executable macosx:revxml.bundle
706678
executable macosx:revbrowser.bundle
707679
executable macosx:revzip.bundle
708-
executable macosx:revfont.bundle
709680
declare external "Speech" using revspeech.bundle
710681
declare external "XML" using revxml.bundle
711682
declare external "Browser" using revbrowser.bundle
712683
declare external "Revolution Zip" using revzip.bundle
713-
declare external "Font Support" using revfont.bundle
714684

715685
//////////
716686

‎Makefile‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ EMMAKE ?= emmake
2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
2828
IPHONEOS_VERSIONS ?= 9.2 10.2
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2
30+
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3031

3132
IOS_SDKS ?= \
3233
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -142,13 +143,13 @@ compile-ios-%:
142143
check-ios-%:
143144
$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
144145

145-
# Dummy targets to prevent our build system from building iOS 5.1 simulator
146-
config-ios-iphonesimulator5.1:
147-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
148-
compile-ios-iphonesimulator5.1:
149-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
150-
check-ios-iphonesimulator5.1:
151-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
146+
# Dummy targets to prevent our build system from building old iOS simulators
147+
$(addprefix config-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
148+
@echo "Skipping $@ (no longer supported)"
149+
$(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
150+
@echo "Skipping $@ (no longer supported)"
151+
$(addprefix check-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
152+
@echo "Skipping $@ (no longer supported)"
152153

153154
# Provide some synonyms for "latest iOS SDK"
154155
$(addsuffix -ios-iphoneos,all config compile check): %: %$(lastword $(IPHONEOS_VERSIONS))
@@ -185,6 +186,16 @@ all-win-%:
185186

186187
$(addsuffix -win,all config compile): %: %-x86
187188

189+
# Dummy rules for Windows x86-64 builds
190+
# TODO Replace with real rules
191+
config-win-x86_64:
192+
mkdir -p build-win-x86_64
193+
compile-win-x86_64:
194+
mkdir -p win-x86_64-bin
195+
all-win-x86_64:
196+
$(MAKE) config-win-x86_64
197+
$(MAKE) compile-win-x86_64
198+
188199
################################################################
189200
# Emscripten rules
190201
################################################################

0 commit comments

Comments
 (0)