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

Feature commercial integration #11

Closed
runrevmark wants to merge 2 commits into from
Closed

Feature commercial integration #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b26832
Modifications to Mac Xcode project to support commercial builds.
runrevmark Apr 16, 2013
dcd3dcc
Updated iOS project for support for commercial builds.
runrevmark Apr 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Specific files #
##################
engine/private/
engine/src/hashedstrings.cpp
engine/src/encodederrors.cpp
engine/src/startupstack.cpp
engine/src/linuxstubs.cpp
engine/include/revbuild.h
lcidlc/src/EncodedSupport.c

# Compiled source #
Expand Down
23 changes: 23 additions & 0 deletions engine/encode_version.rev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#! /usr/bin/revolution -ui

on startup
try
generate
catch tError
write tError & return to stderr
end try
end startup

on generate
local tTemplate
put url ("file:" & $1 & "/include/revbuild.h.in") into tTemplate

local tVars
put url ("file:" & $1 & "/../version") into tVars
repeat for each line tVar in tVars
split tVar by "="
replace "$" & word 1 to -1 of tVar[1] with word 1 to -1 of tVar[2] in tTemplate
end repeat

put tTemplate into url ("binfile:" & $1 & "/include/revbuild.h")
end generate
518 changes: 334 additions & 184 deletions engine/engine-mobile.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

1,639 changes: 1,078 additions & 561 deletions engine/engine.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions engine/include/revbuild.h → engine/include/revbuild.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
#ifndef __BUILD_H
#define __BUILD_H

#define MC_BUILD_REVISION 1511
#define MC_BUILD_ENGINE_MAJOR_VERSION 6
#define MC_BUILD_ENGINE_MINOR_VERSION 0
#define MC_BUILD_ENGINE_POINT_VERSION 0
#define MC_BUILD_REVISION $BUILD_REVISION
#define MC_BUILD_ENGINE_MAJOR_VERSION $BUILD_MAJOR_VERSION
#define MC_BUILD_ENGINE_MINOR_VERSION $BUILD_MINOR_VERSION
#define MC_BUILD_ENGINE_POINT_VERSION $BUILD_POINT_VERSION

#define MC_BUILD_PRODUCT_MAJOR_VERSION MC_BUILD_ENGINE_MAJOR_VERSION
#define MC_BUILD_PRODUCT_MINOR_VERSION MC_BUILD_ENGINE_MINOR_VERSION
#define MC_BUILD_PRODUCT_POINT_VERSION MC_BUILD_ENGINE_POINT_VERSION
#define MC_BUILD_ENGINE_SHORT_VERSION "6.0.0"
#define MC_BUILD_ENGINE_LONG_VERSION "6.0.0.1511"
#define MC_BUILD_ENGINE_SHORT_VERSION "$BUILD_SHORT_VERSION"
#define MC_BUILD_ENGINE_LONG_VERSION "$BUILD_LONG_VERSION"
#define MC_BUILD_PRODUCT_SHORT_VERSION MC_BUILD_ENGINE_SHORT_VERSION
#define MC_BUILD_PRODUCT_LONG_VERSION MC_BUILD_ENGINE_LONG_VERSION
#define MC_BUILD_FILE_SHORT_VERSION MC_BUILD_ENGINE_SHORT_VERSION
Expand Down
12 changes: 6 additions & 6 deletions engine/rsrc/Installer-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Installer</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleIconFile</key>
<string>Installer.icns</string>
<key>CFBundleIdentifier</key>
<string>com.runrev.livecode.installer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleName</key>
<string>Installer</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CFBundleSignature</key>
<string>Revo</string>
<key>CFBundleVersion</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CSResourcesFileMapped</key>
<true/>
<false/>
<key>LFPrefersCarbon</key>
<true/>
<key>LSGetAppDiedEvents</key>
Expand Down
32 changes: 16 additions & 16 deletions engine/rsrc/Revolution-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,48 +25,48 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>LiveCode</string>
<key>CFBundleIdentifier</key>
<string>com.runrev.livecode</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleIconFile</key>
<string>LiveCode.icns</string>
<key>CFBundleIdentifier</key>
<string>com.runrev.livecode</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleName</key>
<string>LiveCode</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CFBundleSignature</key>
<string>Revo</string>
<key>CFBundleVersion</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LFPrefersCarbon</key>
<true/>
<key>LSGetAppDiedEvents</key>
<true/>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<false/>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2000-2013, Runtime Revolution Ltd., All Rights Reserved.</string>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeIdentifier</key>
<string>com.runrev.revolution.stack</string>
<key>UTTypeDescription</key>
<string>LiveCode Stack</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>LiveCode Stack</string>
<key>UTTypeIdentifier</key>
<string>com.runrev.revolution.stack</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.macos.ostype</key>
Expand All @@ -78,14 +78,14 @@
</dict>
</dict>
<dict>
<key>UTTypeIdentifier</key>
<string>com.runrev.livecode.stack</string>
<key>UTTypeDescription</key>
<string>LiveCode Stack</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>LiveCode Stack</string>
<key>UTTypeIdentifier</key>
<string>com.runrev.livecode.stack</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.macos.ostype</key>
Expand Down
14 changes: 7 additions & 7 deletions engine/rsrc/Standalone-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Standalone</string>
<key>CFBundleIdentifier</key>
<string>com.runrev.revolution</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleIconFile</key>
<string>Standalone.icns</string>
<key>CFBundleIdentifier</key>
<string>com.runrev.revolution</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>6.0.0.1511, Copyright 2000-2013 Runtime Revolution Ltd.</string>
<string>$(BUILD_LONG_VERSION), Copyright 2000-2013 Runtime Revolution Ltd.</string>
<key>CFBundleName</key>
<string>Revolution</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CFBundleSignature</key>
<string>Revo</string>
<key>CFBundleVersion</key>
<string>6.0.0.1511</string>
<string>$(BUILD_LONG_VERSION)</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LFPrefersCarbon</key>
Expand Down
2 changes: 0 additions & 2 deletions engine/src/mblad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ void MCAdExecCreateAd(MCExecContext& ctxt, const char *p_name, MCAdType p_type,
t_success = false;
}

#ifdef FEATURE_INNERACTIVE
if (t_success)
{
uint32_t t_timeout;
Expand Down Expand Up @@ -385,7 +384,6 @@ void MCAdExecCreateAd(MCExecContext& ctxt, const char *p_name, MCAdType p_type,
t_ad->Release();

}
#endif

if (!t_success)
ctxt.SetTheResultToStaticCString("could not create ad");
Expand Down
11 changes: 10 additions & 1 deletion engine/src/mblandroidad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */

// Due to licensing issues with the Inneractive SDK, support for mobile ads
// in community is disabled.
#ifdef FEATURE_INNERACTIVE

#include "prefix.h"

Expand Down Expand Up @@ -45,6 +44,8 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */

#include "mblad.h"

#ifdef FEATURE_INNERACTIVE

////////////////////////////////////////////////////////////////////////////////

class MCAndroidInneractiveAd : public MCAd
Expand Down Expand Up @@ -231,4 +232,12 @@ JNIEXPORT void JNICALL Java_com_runrev_android_InneractiveAdWrapper_doAdUpdate(J

////////////////////////////////////////////////////////////////////////////////

#else

bool MCSystemInneractiveAdCreate(MCExecContext &ctxt, MCAd *&r_ad, MCAdType p_type, MCAdTopLeft p_top_left, uint32_t p_timeout, MCVariableValue *p_meta_data)
{
return false;
}

#endif

12 changes: 11 additions & 1 deletion engine/src/mbliphonead.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

// Due to licensing issues with the Inneractive SDK, support for mobile ads
// in community is disabled.
#ifdef FEATURE_INNERACTIVE

#include "prefix.h"

Expand All @@ -41,6 +40,9 @@
#import <UIKit/UIKit.h>

#include "mblad.h"

#ifdef FEATURE_INNERACTIVE

#include "InneractiveAd.h"

float MCIPhoneGetNativeControlScale(void);
Expand Down Expand Up @@ -451,4 +453,12 @@ bool MCSystemInneractiveAdCreate(MCExecContext &ctxt, MCAd*& r_ad, MCAdType p_ty

////////////////////////////////////////////////////////////////////////////////

#else

bool MCSystemInneractiveAdCreate(MCExecContext &ctxt, MCAd*& r_ad, MCAdType p_type, MCAdTopLeft p_top_left, uint32_t p_timeout, MCVariableValue *p_meta_data)
{
return false;
}

#endif

1 change: 1 addition & 0 deletions rules/Global Mobile.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "../version"
OWNER = .
SOLUTION_DIR = $(PROJECT_DIR)/../$(OWNER)
SYMROOT = $(SOLUTION_DIR)/_build/ios/$(SDK_NAME)
Expand Down
1 change: 1 addition & 0 deletions rules/Global.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "../version"
OWNER = .
SOLUTION_DIR = $(PROJECT_DIR)/../$(OWNER)
SYMROOT = $(SOLUTION_DIR)/_build/mac
Expand Down
6 changes: 6 additions & 0 deletions version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
BUILD_REVISION = 1511
BUILD_MAJOR_VERSION = 6
BUILD_MINOR_VERSION = 0
BUILD_POINT_VERSION = 0
BUILD_SHORT_VERSION = 6.0.0
BUILD_LONG_VERSION = 6.0.0.1511