diff options
| author | ruki <[email protected]> | 2020-09-25 00:33:07 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-25 00:33:07 +0800 |
| commit | 90af4956738036172984f068502624bbc515cae7 (patch) | |
| tree | 7cd7177becaf98e676ae8eaa478f042e14505d3a /xmake/rules/xcode | |
| parent | 700f08a7bae11c22295f884610f98b7b99eb1790 (diff) | |
fix trailing white-space
Diffstat (limited to 'xmake/rules/xcode')
| -rw-r--r-- | xmake/rules/xcode/application/build.lua | 8 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/install.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/load.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/package.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/run.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/uninstall.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/xcode/bundle/xmake.lua | 10 | ||||
| -rw-r--r-- | xmake/rules/xcode/framework/xmake.lua | 10 | ||||
| -rw-r--r-- | xmake/rules/xcode/info_plist/xmake.lua | 8 | ||||
| -rw-r--r-- | xmake/rules/xcode/storyboard/xmake.lua | 8 | ||||
| -rw-r--r-- | xmake/rules/xcode/xcassets/xmake.lua | 10 |
12 files changed, 35 insertions, 35 deletions
diff --git a/xmake/rules/xcode/application/build.lua b/xmake/rules/xcode/application/build.lua index 03aa5da3e..f269d3d92 100644 --- a/xmake/rules/xcode/application/build.lua +++ b/xmake/rules/xcode/application/build.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -37,9 +37,9 @@ function main (target, opt) local dependfile = target:dependfile(bundledir) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end - + -- trace progress info progress.show(opt.progress, "${color.build.target}generating.xcode.$(mode) %s", path.filename(bundledir)) @@ -72,7 +72,7 @@ function main (target, opt) i = i + 1 end end - + -- generate embedded.mobileprovision to *.app/embedded.mobileprovision local mobile_provision_embedded = path.join(bundledir, "embedded.mobileprovision") local mobile_provision = target:values("xcode.mobile_provision") or get_config("xcode_mobile_provision") diff --git a/xmake/rules/xcode/application/install.lua b/xmake/rules/xcode/application/install.lua index 529e99360..d24a8c824 100644 --- a/xmake/rules/xcode/application/install.lua +++ b/xmake/rules/xcode/application/install.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki diff --git a/xmake/rules/xcode/application/load.lua b/xmake/rules/xcode/application/load.lua index b98c4e257..cb90a6c83 100644 --- a/xmake/rules/xcode/application/load.lua +++ b/xmake/rules/xcode/application/load.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -36,7 +36,7 @@ function main (target) target:data_set("xcode.bundle.contentsdir", contentsdir) target:data_set("xcode.bundle.resourcesdir", resourcesdir) - -- set target directory for app + -- set target directory for app target:set("kind", "binary") target:set("filename", target:basename()) diff --git a/xmake/rules/xcode/application/package.lua b/xmake/rules/xcode/application/package.lua index 48d4debb6..d7aa9cbfd 100644 --- a/xmake/rules/xcode/application/package.lua +++ b/xmake/rules/xcode/application/package.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki diff --git a/xmake/rules/xcode/application/run.lua b/xmake/rules/xcode/application/run.lua index b6a36a145..38f96f330 100644 --- a/xmake/rules/xcode/application/run.lua +++ b/xmake/rules/xcode/application/run.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki diff --git a/xmake/rules/xcode/application/uninstall.lua b/xmake/rules/xcode/application/uninstall.lua index 31d0c899c..be06e9fff 100644 --- a/xmake/rules/xcode/application/uninstall.lua +++ b/xmake/rules/xcode/application/uninstall.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki diff --git a/xmake/rules/xcode/application/xmake.lua b/xmake/rules/xcode/application/xmake.lua index 827ce5cd6..e2f242397 100644 --- a/xmake/rules/xcode/application/xmake.lua +++ b/xmake/rules/xcode/application/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -32,7 +32,7 @@ rule("xcode.application") -- package *.app to *.ipa (iphoneos) or *.dmg (macosx) on_package("package") - + -- install application on_install("install") diff --git a/xmake/rules/xcode/bundle/xmake.lua b/xmake/rules/xcode/bundle/xmake.lua index d83920b48..f1d4fdd7a 100644 --- a/xmake/rules/xcode/bundle/xmake.lua +++ b/xmake/rules/xcode/bundle/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -26,7 +26,7 @@ rule("xcode.bundle") -- we must set kind before target.on_load(), may we will use target in on_load() before_load(function (target) - + -- get bundle directory local targetdir = target:targetdir() local bundledir = path.join(targetdir, target:basename() .. ".bundle") @@ -42,7 +42,7 @@ rule("xcode.bundle") target:data_set("xcode.bundle.contentsdir", contentsdir) target:data_set("xcode.bundle.resourcesdir", resourcesdir) - -- set target info for bundle + -- set target info for bundle target:set("filename", target:basename()) -- generate binary as bundle, we cannot set `-shared` or `-dynamiclib` @@ -71,9 +71,9 @@ rule("xcode.bundle") local dependfile = target:dependfile(bundledir) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end - + -- trace progress info progress.show(opt.progress, "${color.build.target}generating.xcode.$(mode) %s", path.filename(bundledir)) diff --git a/xmake/rules/xcode/framework/xmake.lua b/xmake/rules/xcode/framework/xmake.lua index 35264d12f..7eed4a1db 100644 --- a/xmake/rules/xcode/framework/xmake.lua +++ b/xmake/rules/xcode/framework/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -26,7 +26,7 @@ rule("xcode.framework") -- we must set kind before target.on_load(), may we will use target in on_load() before_load(function (target) - + -- get framework directory local targetdir = target:targetdir() local bundledir = path.join(targetdir, target:basename() .. ".framework") @@ -38,7 +38,7 @@ rule("xcode.framework") target:data_set("xcode.bundle.contentsdir", contentsdir) target:data_set("xcode.bundle.resourcesdir", resourcesdir) - -- set target info for framework + -- set target info for framework if not target:get("kind") then target:set("kind", "shared") end @@ -97,9 +97,9 @@ rule("xcode.framework") local dependfile = target:dependfile(bundledir) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end - + -- trace progress info progress.show(opt.progress, "${color.build.target}generating.xcode.$(mode) %s", path.filename(bundledir)) diff --git a/xmake/rules/xcode/info_plist/xmake.lua b/xmake/rules/xcode/info_plist/xmake.lua index 6f1899f8e..e6f7c82c0 100644 --- a/xmake/rules/xcode/info_plist/xmake.lua +++ b/xmake/rules/xcode/info_plist/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -44,15 +44,15 @@ rule("xcode.info_plist") local dependfile = target:dependfile(sourcefile) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end - + -- trace progress info progress.show(opt.progress, "${color.build.object}processing.xcode.$(mode) %s", sourcefile) -- process and generate Info.plist local info_plist_file = path.join(target:rule("xcode.framework") and resourcesdir or contentsdir, path.filename(sourcefile)) - local maps = + local maps = { DEVELOPMENT_LANGUAGE = "en", EXECUTABLE_NAME = target:basename(), diff --git a/xmake/rules/xcode/storyboard/xmake.lua b/xmake/rules/xcode/storyboard/xmake.lua index 264525b61..83b04fbb0 100644 --- a/xmake/rules/xcode/storyboard/xmake.lua +++ b/xmake/rules/xcode/storyboard/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -24,7 +24,7 @@ rule("xcode.storyboard") -- support add_files("*.storyboard") set_extensions(".storyboard") - -- build *.storyboard + -- build *.storyboard on_build_file(function (target, sourcefile, opt) -- imports @@ -47,9 +47,9 @@ rule("xcode.storyboard") local dependfile = target:dependfile(sourcefile) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end - + -- trace progress info progress.show(opt.progress, "${color.build.object}compiling.xcode.$(mode) %s", sourcefile) diff --git a/xmake/rules/xcode/xcassets/xmake.lua b/xmake/rules/xcode/xcassets/xmake.lua index 6803a2999..5c1912dd4 100644 --- a/xmake/rules/xcode/xcassets/xmake.lua +++ b/xmake/rules/xcode/xcassets/xmake.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -24,7 +24,7 @@ rule("xcode.xcassets") -- support add_files("*.xcassets") set_extensions(".xcassets") - -- build *.xcassets + -- build *.xcassets on_build_file(function (target, sourcefile, opt) -- imports @@ -44,14 +44,14 @@ rule("xcode.xcassets") local dependfile = target:dependfile(sourcefile) local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) if not depend.is_changed(dependinfo, {lastmtime = os.mtime(dependfile)}) then - return + return end -- ensure resources directory exists if not os.isdir(resourcesdir) then os.mkdir(resourcesdir) end - + -- trace progress info progress.show(opt.progress, "${color.build.object}compiling.xcode.$(mode) %s", sourcefile) @@ -103,7 +103,7 @@ rule("xcode.xcassets") table.insert(argv, resourcesdir) table.insert(argv, sourcefile) os.vrunv(path.join(xcode_usrdir, "bin", "actool"), argv) - + -- update files and values to the dependent file dependinfo.files = {sourcefile} depend.save(dependinfo, dependfile) |
