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

Commit 05c1a30

Browse files
author
Alexandru Brisan
authored
Merge pull request #2 from livecodealex/develop
Update branch
2 parents 03b363a + 99327e8 commit 05c1a30

File tree

1,082 files changed

+31391
-20637
lines changed

Some content is hidden

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

1,082 files changed

+31391
-20637
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ sdks/
116116

117117
# Ignore prebuilts #
118118
###################
119+
prebuilt/bin
119120
prebuilt/include
120121
prebuilt/lib
122+
prebuilt/share
121123
prebuilt/build
122124
prebuilt/packaged
123125
prebuilt/fetched
@@ -127,3 +129,9 @@ prebuilt/unpacked
127129
###################################
128130
stamp-mlc*
129131
_mlc
132+
133+
# Built Notes #
134+
#################
135+
LiveCodeNotes-*
136+
LiveCodeUpdates-*
137+
LiveCodeUserGuide-*

‎Installer/package.txt‎

Lines changed: 78 additions & 58 deletions
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 65 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

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
28-
IPHONEOS_VERSIONS ?= 9.2 10.2 10.3
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 10.3
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.0
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.0
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \
@@ -67,24 +67,61 @@ clean-linux:
6767
find . -name \*.lcb | xargs touch
6868

6969
check-common-%:
70+
ifneq ($(TRAVIS),undefined)
71+
@echo "travis_fold:start:testengine"
72+
@echo "TEST Engine"
73+
endif
7074
$(MAKE) -C tests bin_dir=../$*-bin
75+
ifneq ($(TRAVIS),undefined)
76+
@echo "travis_fold:end:testengine"
77+
@echo "travis_fold:start:testide"
78+
@echo "TEST IDE"
79+
endif
7180
$(MAKE) -C ide/tests bin_dir=../../$*-bin
81+
ifneq ($(TRAVIS),undefined)
82+
@echo "travis_fold:end:testide"
83+
@echo "travis_fold:start:testextensions"
84+
@echo "TEST Extensions"
85+
endif
7286
$(MAKE) -C extensions bin_dir=../$*-bin
73-
87+
ifneq ($(TRAVIS),undefined)
88+
@echo "travis_fold:end:testextensions"
89+
endif
7490
################################################################
7591
# Linux rules
7692
################################################################
7793

7894
LINUX_ARCHS = x86_64 x86
7995

8096
config-linux-%:
97+
ifneq ($(TRAVIS),undefined)
98+
@echo "travis_fold:start:config"
99+
@echo "CONFIGURE"
100+
endif
81101
./config.sh --platform linux-$*
82-
102+
ifneq ($(TRAVIS),undefined)
103+
@echo "travis_fold:end:config"
104+
endif
105+
83106
compile-linux-%:
107+
ifneq ($(TRAVIS),undefined)
108+
@echo "travis_fold:start:compile"
109+
@echo "COMPILE"
110+
endif
84111
$(MAKE) -C build-linux-$*/livecode default
85-
112+
ifneq ($(TRAVIS),undefined)
113+
@echo "travis_fold:end:compile"
114+
endif
115+
86116
check-linux-%:
117+
ifneq ($(TRAVIS),undefined)
118+
@echo "travis_fold:start:testcpp"
119+
@echo "TEST C++"
120+
endif
87121
$(MAKE) -C build-linux-$*/livecode check
122+
ifneq ($(TRAVIS),undefined)
123+
@echo "travis_fold:end:testcpp"
124+
endif
88125
$(MAKE) check-common-linux-$*
89126

90127
all-linux-%:
@@ -119,15 +156,36 @@ $(addsuffix -android,all config compile check): %: %-armv6
119156
################################################################
120157

121158
config-mac:
159+
ifneq ($(TRAVIS),undefined)
160+
@echo "travis_fold:start:config"
161+
@echo "CONFIGURE"
162+
endif
122163
./config.sh --platform mac
123-
164+
ifneq ($(TRAVIS),undefined)
165+
@echo "travis_fold:end:config"
166+
endif
167+
124168
compile-mac:
169+
ifneq ($(TRAVIS),undefined)
170+
@echo "travis_fold:start:compile"
171+
@echo "COMPILE"
172+
endif
125173
$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target default \
126174
$(XCODEBUILD_FILTER)
127-
175+
ifneq ($(TRAVIS),undefined)
176+
@echo "travis_fold:end:compile"
177+
endif
178+
128179
check-mac:
180+
ifneq ($(TRAVIS),undefined)
181+
@echo "travis_fold:start:testcpp"
182+
@echo "TEST C++"
183+
endif
129184
$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check \
130185
$(XCODEBUILD_FILTER)
186+
ifneq ($(TRAVIS),undefined)
187+
@echo "travis_fold:end:testcpp"
188+
endif
131189
$(MAKE) check-common-mac
132190

133191

‎buildbot.mk‎

Lines changed: 84 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
# Load version information
2424
include version
2525

26+
GIT_HASH_HEXIT_COUNT=10
27+
2628
# Get git commit information
2729
ifeq ($(BUILD_EDITION),commercial)
28-
GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short HEAD)
30+
GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
2931
else
30-
GIT_VERSION=g$(shell git rev-parse --short HEAD)
32+
GIT_VERSION=g$(shell git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
3133
endif
3234

3335
################################################################
@@ -80,7 +82,11 @@ else ifeq ($(BUILD_PLATFORM),linux-x86_64)
8082
LIVECODE = $(bin_dir)/LiveCode-Community
8183
buildtool_platform = linux
8284
UPLOAD_ENABLE_CHECKSUM ?= yes
85+
ifeq ($(BUILD_EDITION),commercial)
8386
UPLOAD_RELEASE_NOTES ?= yes
87+
else
88+
UPLOAD_RELEASE_NOTES ?= no
89+
endif
8490
endif
8591

8692
# FIXME add --warn-as-error
@@ -96,58 +102,23 @@ UPLOAD_SERVER ?= meg.on-rev.com
96102
UPLOAD_PATH = staging/$(BUILD_LONG_VERSION)/$(GIT_VERSION)
97103
UPLOAD_MAX_RETRIES = 50
98104

99-
ifeq ($(BUILD_EDITION),commercial)
100-
dist-docs: dist-docs-commercial
101-
dist-docs: dist-guide-commercial
102-
dist-notes: dist-notes-commercial
103-
endif
104-
105-
dist-docs: dist-docs-community
106-
dist-docs: dist-guide-community
107-
dist-notes: dist-notes-community
105+
dist-docs: dist-docs-api dist-docs-guide
108106

109-
dist-docs-community:
107+
dist-docs-api:
110108
mkdir -p $(docs_build_dir)
111109
$(buildtool_command) --platform $(buildtool_platform) --stage docs \
112-
--edition community \
113-
--built-docs-dir $(docs_build_dir)/cooked-community
110+
--built-docs-dir $(docs_build_dir)
114111

115-
dist-docs-commercial:
116-
mkdir -p $(docs_build_dir)
117-
$(buildtool_command) --platform $(buildtool_platform) \
118-
--stage docs --edition indy \
119-
--built-docs-dir $(docs_build_dir)/cooked-commercial
120-
$(buildtool_command) --platform $(buildtool_platform) \
121-
--stage docs --edition business \
122-
--built-docs-dir $(docs_build_dir)/cooked-commercial
123-
124-
dist-notes-community:
112+
dist-notes:
125113
WKHTMLTOPDF=$(WKHTMLTOPDF) \
126114
$(buildtool_command) --platform $(buildtool_platform) \
127115
--stage notes --warn-as-error \
128-
--built-docs-dir $(docs_build_dir)/cooked-community
116+
--built-docs-dir $(docs_build_dir)
129117

130-
dist-notes-commercial:
118+
dist-docs-guide:
131119
WKHTMLTOPDF=$(WKHTMLTOPDF) \
132120
$(buildtool_command) --platform $(buildtool_platform) \
133-
--stage notes --warn-as-error \
134-
--built-docs-dir $(docs_build_dir)/cooked-commercial
135-
136-
dist-guide-community:
137-
WKHTMLTOPDF=$(WKHTMLTOPDF) \
138-
$(buildtool_command) --platform $(buildtool_platform) \
139-
--edition community \
140-
--stage guide --warn-as-error
141-
142-
dist-guide-commercial:
143-
WKHTMLTOPDF=$(WKHTMLTOPDF) \
144-
$(buildtool_command) --platform $(buildtool_platform) \
145-
--edition indy \
146-
--stage guide --warn-as-error
147-
WKHTMLTOPDF=$(WKHTMLTOPDF) \
148-
$(buildtool_command) --platform $(buildtool_platform) \
149-
--edition business \
150-
--stage guide --warn-as-error
121+
--stage guide --warn-as-error
151122

152123
ifeq ($(BUILD_EDITION),commercial)
153124
dist-server: dist-server-commercial
@@ -165,24 +136,28 @@ dist-server-commercial:
165136

166137
ifeq ($(BUILD_EDITION),commercial)
167138
dist-tools: dist-tools-commercial
168-
distmac-disk: distmac-disk-indy distmac-disk-business
139+
distmac-disk: distmac-disk-communityplus distmac-disk-indy distmac-disk-business
169140
endif
170141

171142
dist-tools: dist-tools-community dist-tools-version-check
172143
distmac-disk: distmac-disk-community
173144

174145
dist-tools-community:
175146
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition community \
176-
--built-docs-dir $(docs_build_dir)/cooked-community
147+
--built-docs-dir $(docs_build_dir)
177148
dist-tools-commercial:
149+
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition communityplus \
150+
--built-docs-dir $(docs_build_dir)
178151
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition indy \
179-
--built-docs-dir $(docs_build_dir)/cooked-commercial
152+
--built-docs-dir $(docs_build_dir)
180153
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition business \
181-
--built-docs-dir $(docs_build_dir)/cooked-commercial
154+
--built-docs-dir $(docs_build_dir)
182155
# Ensure that the version for which we're trying to build installers
183156
# hasn't already been tagged.
184157
dist-tools-version-check:
185-
@if git rev-parse refs/tags/$(BUILD_SHORT_VERSION) \
158+
@git tag -l | xargs git tag -d ;\
159+
git fetch --tags ;\
160+
if git rev-parse refs/tags/$(BUILD_SHORT_VERSION) \
186161
>/dev/null 2>&1 ; then \
187162
echo; \
188163
echo "$(BUILD_SHORT_VERSION) has already been released."; \
@@ -195,6 +170,8 @@ dist-tools-version-check:
195170

196171
distmac-bundle-community:
197172
$(buildtool_command) --platform mac --stage bundle --edition community
173+
distmac-bundle-communityplus:
174+
$(buildtool_command) --platform mac --stage bundle --edition communityplus
198175
distmac-bundle-indy:
199176
$(buildtool_command) --platform mac --stage bundle --edition indy
200177
distmac-bundle-business:
@@ -214,13 +191,27 @@ dist-upload-files.txt sha1sum.txt:
214191
-o -name 'LiveCode*Docs-*.zip' \
215192
-o -name '*-bin.tar.xz' \
216193
-o -name '*-bin.tar.bz2' \
217-
> dist-upload-files.txt; \
194+
-o -name 'LiveCodeForFM-Mac-Solution.zip' \
195+
-o -name 'LiveCodeForFM-Mac-Plugin.zip' \
196+
-o -name 'LiveCodeForFM-Win-x86-Solution.zip' \
197+
-o -name 'LiveCodeForFM-Win-x86-Plugin.zip' \
198+
-o -name 'LiveCodeForFM-Win-x86_64-Solution.zip' \
199+
-o -name 'LiveCodeForFM-Win-x86_64-Plugin.zip' \
200+
-o -name 'LiveCodeForFM-All-Solutions.zip' \
201+
-o -name 'LiveCodeForFM-All-Plugins.zip' \
202+
-o -name 'LiveCodeForFM-Solution.zip' \
203+
-o -name 'LiveCodeForFM.zip' \
204+
> dist-upload-files.txt; \
218205
if test "${UPLOAD_RELEASE_NOTES}" = "yes"; then \
219206
find . -maxdepth 1 -name 'LiveCodeNotes*.pdf' >> dist-upload-files.txt; \
220-
find . -maxdepth 1 -name 'LiveCodeNotes*.html' >> dist-upload-file; \
207+
find . -maxdepth 1 -name 'LiveCodeNotes*.html' >> dist-upload-files.txt; \
208+
find . -maxdepth 1 -name 'LiveCodeUpdates*.md' >> dist-upload-files.txt; \
209+
find . -maxdepth 1 -name 'LiveCodeUpdates*.html' >> dist-upload-files.txt; \
210+
find . -maxdepth 1 -name 'LiveCodeUserGuide*.html' >> dist-upload-files.txt; \
211+
find . -maxdepth 1 -name 'LiveCodeUserGuide*.pdf' >> dist-upload-files.txt; \
221212
fi; \
222213
if test "$(UPLOAD_ENABLE_CHECKSUM)" = "yes"; then \
223-
$(SHA1SUM) < dist-upload-files.txt > sha1sum.txt; \
214+
xargs --arg-file=dist-upload-files.txt $(SHA1SUM) > sha1sum.txt; \
224215
echo sha1sum.txt >> dist-upload-files.txt; \
225216
else \
226217
touch sha1sum.txt; \
@@ -253,11 +244,50 @@ dist-upload: dist-upload-files.txt dist-upload-mkdir
253244
# resulting archive gets transferred to a Mac for signing and
254245
# conversion to a DMG.
255246
distmac-archive:
247+
set -e; \
256248
find . -maxdepth 1 -name 'LiveCode*Installer-*-Mac.app' -print0 \
257-
| xargs -0 tar -Jcvf mac-installer.tar.xz
249+
| xargs -0 tar -cvf mac-installer.tar; \
250+
cd mac-bin; \
251+
find . -maxdepth 1 -name 'livecodeforfm-*.fmplugin' -print0 \
252+
| xargs -0 tar --append --file=../mac-installer.tar; \
253+
cd ..; \
254+
cd win-x86-bin; \
255+
find . -maxdepth 1 -name 'livecodeforfm-*.fmx' -print0 \
256+
| xargs -0 tar --append --file=../mac-installer.tar; \
257+
cd ..; \
258+
cd win-x86_64-bin; \
259+
find . -maxdepth 1 -name 'livecodeforfm-*.fmx64' -print0 \
260+
| xargs -0 tar --append --file=../mac-installer.tar; \
261+
cd ..; \
262+
bzip2 -c mac-installer.tar > mac-installer.tar.xz
258263

259264
distmac-extract:
260-
tar -xvf mac-installer.tar.xz
265+
set -e; \
266+
tar -xvf mac-installer.tar.xz; \
267+
cp -r ${private_dir}/filemaker/solutions/LiveCodeForFM.fmp12 . ; \
268+
$(buildtool_command) --platform mac --stage fmpackage --debug; \
269+
$(buildtool_command) --platform win-x86 --stage fmpackage --debug; \
270+
$(buildtool_command) --platform win-x86_64 --stage fmpackage --debug; \
271+
$(buildtool_command) --platform universal --stage fmpackage --debug; \
272+
find . -maxdepth 1 -name 'LiveCodeForFM-Mac-*.fmp12' -print0 \
273+
| xargs -0 zip -r LiveCodeForFM-Mac-Solution.zip; \
274+
find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86-*.fmp12' -print0 \
275+
| xargs -0 zip -r LiveCodeForFM-Win-x86-Solution.zip; \
276+
find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86_64-*.fmp12' -print0 \
277+
| xargs -0 zip -r LiveCodeForFM-Win-x86_64-Solution.zip; \
278+
find . -maxdepth 1 -name 'LiveCodeForFM-[1-9]*.fmp12' -print0 \
279+
| xargs -0 zip -r LiveCodeForFM.zip; \
280+
find . -maxdepth 1 -name 'livecodeforfm-*.*' -print0 \
281+
| xargs -0 zip -r LiveCodeForFM-All-Plugins.zip; \
282+
find . -maxdepth 1 -name 'livecodeforfm-*.fmplugin' -print0 \
283+
| xargs -0 zip -r LiveCodeForFM-Mac-Plugin.zip; \
284+
find . -maxdepth 1 -name 'livecodeforfm-*.fmx' -print0 \
285+
| xargs -0 zip -r LiveCodeForFM-Win-x86-Plugin.zip; \
286+
find . -maxdepth 1 -name 'livecodeforfm-*.fmx64' -print0 \
287+
| xargs -0 zip -r LiveCodeForFM-Win-x86_64-Plugin.zip; \
288+
find . -maxdepth 1 -name 'LiveCodeForFM.fmp12' -print0 \
289+
| xargs -0 zip -r LiveCodeForFM-Solution.zip
290+
261291

262292
# Final installer creation for Mac
263293
distmac-disk-%: distmac-bundle-%

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos10.3',
45+
'universal-ios-iphoneos11.0',
4646
'universal-ios-iphoneos10.2',
4747
'universal-ios-iphoneos9.2',
48-
'universal-ios-iphonesimulator10.3',
48+
'universal-ios-iphonesimulator11.0',
4949
'universal-ios-iphonesimulator10.2',
5050
'universal-ios-iphonesimulator9.2',
5151
'universal-ios-iphonesimulator8.2',

0 commit comments

Comments
 (0)