Skip to content
This repository has been archived by the owner on Jan 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #26 from vgorloff/develop
Browse files Browse the repository at this point in the history
RC 1.2.4
  • Loading branch information
vgorloff authored Jun 6, 2020
2 parents e181f96 + 633d483 commit 7c172dd
Show file tree
Hide file tree
Showing 20 changed files with 9,213 additions and 172 deletions.
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"cSpell.words": [
"xcodebuild",
"xcpretty"
]
}
43 changes: 43 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "CI",
"type": "shell",
"command": "./Scripts/ci.sh",
"presentation": {
"panel": "shared",
"focus": false,
"clear": true
},
"group": "build",
"problemMatcher": []
},
{
"label": "Make Standalone",
"type": "shell",
"command": "./Scripts/standalone.rb",
"presentation": {
"panel": "shared",
"focus": false,
"clear": true
},
"group": "build",
"problemMatcher": []
},
{
"label": "Generate",
"type": "shell",
"command": "xcodegen",
"presentation": {
"panel": "shared",
"focus": false,
"clear": true
},
"group": "build",
"problemMatcher": []
}
]
}
838 changes: 725 additions & 113 deletions AUHost.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion AUHost.xcodeproj/xcshareddata/xcschemes/AUHost.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
18 changes: 18 additions & 0 deletions Configuration/App-macOS.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include "Common.xcconfig"

SDKROOT = macosx

ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES

DYLIB_INSTALL_NAME_BASE = @rpath

LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks

COMBINE_HIDPI_IMAGES = YES
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon

CODE_SIGN_IDENTITY = Mac Developer
CODE_SIGN_STYLE = Automatic
PROVISIONING_PROFILE_SPECIFIER =

OTHER_LDFLAGS = $(inherited) -framework AppKit
153 changes: 153 additions & 0 deletions Configuration/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
AWL_COPYRIGHT = Copyright © 2020 Volodymyr Gorlov. All rights reserved.

DEVELOPMENT_TEAM = H3M62US4J7

CURRENT_PROJECT_VERSION = $(AWL_BUNDLE_VERSION:default=1)
DYLIB_COMPATIBILITY_VERSION = $(CURRENT_PROJECT_VERSION)
DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)
PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
PRODUCT_BUNDLE_IDENTIFIER = com.mc.$(PRODUCT_NAME)
INFOPLIST_FILE = Info.plist

MACOSX_DEPLOYMENT_TARGET = 10.14
IPHONEOS_DEPLOYMENT_TARGET = 11.0

// Standard settings

ALWAYS_SEARCH_USER_PATHS = NO
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x
CLANG_CXX_LIBRARY = libc++
CLANG_ENABLE_MODULES = YES
CLANG_ENABLE_OBJC_ARC = YES
CLANG_ENABLE_OBJC_WEAK = YES
CLANG_MODULES_AUTOLINK = NO
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES
CLANG_WARN_BOOL_CONVERSION = YES
CLANG_WARN_COMMA = YES
CLANG_WARN_CONSTANT_CONVERSION = YES
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
CLANG_WARN_EMPTY_BODY = YES
CLANG_WARN_ENUM_CONVERSION = YES
CLANG_WARN_INFINITE_RECURSION = YES
CLANG_WARN_INT_CONVERSION = YES
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES
CLANG_WARN_STRICT_PROTOTYPES = YES
CLANG_WARN_SUSPICIOUS_MOVE = YES
CLANG_WARN_UNREACHABLE_CODE = YES
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
DEFINES_MODULE = NO
ENABLE_STRICT_OBJC_MSGSEND = YES
GCC_C_LANGUAGE_STANDARD = gnu11
GCC_DYNAMIC_NO_PIC = NO
GCC_NO_COMMON_BLOCKS = YES
GCC_WARN_64_TO_32_BIT_CONVERSION = YES
GCC_WARN_ABOUT_RETURN_TYPE = YES
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
GCC_WARN_UNDECLARED_SELECTOR = YES
GCC_WARN_UNINITIALIZED_AUTOS = YES
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
HEADERMAP_USES_VFS = YES
OTHER_LDFLAGS = $(inherited) -ObjC -framework Foundation
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
STRIP_INSTALLED_PRODUCT = YES
STRIP_STYLE = non-global
STRIP_SWIFT_SYMBOLS = YES
SWIFT_INSTALL_OBJC_HEADER = NO
SWIFT_VERSION = 5.0
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO

// Standard (per-configuration) settings

COPY_PHASE_STRIP_Debug = NO
COPY_PHASE_STRIP_Release = YES
COPY_PHASE_STRIP_ProductionDebug = NO
COPY_PHASE_STRIP_ProductionRelease = YES
COPY_PHASE_STRIP = $(COPY_PHASE_STRIP_$(CONFIGURATION))

DEBUG_INFORMATION_FORMAT_Debug = dwarf
DEBUG_INFORMATION_FORMAT_Release = dwarf-with-dsym
DEBUG_INFORMATION_FORMAT_ProductionDebug = dwarf
DEBUG_INFORMATION_FORMAT_ProductionRelease = dwarf-with-dsym
DEBUG_INFORMATION_FORMAT = $(DEBUG_INFORMATION_FORMAT_$(CONFIGURATION))

DEPLOYMENT_POSTPROCESSING_Debug = NO
DEPLOYMENT_POSTPROCESSING_Release = YES
DEPLOYMENT_POSTPROCESSING_ProductionDebug = NO
DEPLOYMENT_POSTPROCESSING_ProductionRelease = YES
DEPLOYMENT_POSTPROCESSING = $(DEPLOYMENT_POSTPROCESSING_$(CONFIGURATION))

ENABLE_BITCODE_Debug = NO
ENABLE_BITCODE_Release = NO
ENABLE_BITCODE_ProductionDebug = NO
ENABLE_BITCODE_ProductionRelease = NO
ENABLE_BITCODE = $(ENABLE_BITCODE_$(CONFIGURATION))

ENABLE_TESTABILITY_Debug = YES
ENABLE_TESTABILITY_Release = NO
ENABLE_TESTABILITY_ProductionDebug = YES
ENABLE_TESTABILITY_ProductionRelease = NO
ENABLE_TESTABILITY = $(ENABLE_TESTABILITY_$(CONFIGURATION))

GCC_PREPROCESSOR_DEFINITIONS_Debug = DEBUG=1
GCC_PREPROCESSOR_DEFINITIONS_Release =
GCC_PREPROCESSOR_DEFINITIONS_ProductionDebug = PRODUCTION=1 DEBUG=1
GCC_PREPROCESSOR_DEFINITIONS_ProductionRelease = PRODUCTION=1
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS_$(CONFIGURATION))

GCC_OPTIMIZATION_LEVEL_Debug = 0
GCC_OPTIMIZATION_LEVEL_Release =
GCC_OPTIMIZATION_LEVEL_ProductionDebug = 0
GCC_OPTIMIZATION_LEVEL_ProductionRelease =
GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CONFIGURATION))

SWIFT_ACTIVE_COMPILATION_CONDITIONS_Debug = DEBUG
SWIFT_ACTIVE_COMPILATION_CONDITIONS_Release =
SWIFT_ACTIVE_COMPILATION_CONDITIONS_ProductionDebug = PRODUCTION DEBUG
SWIFT_ACTIVE_COMPILATION_CONDITIONS_ProductionRelease = PRODUCTION
SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS_$(CONFIGURATION))

SWIFT_COMPILATION_MODE_Debug = singlefile
SWIFT_COMPILATION_MODE_Release = wholemodule
SWIFT_COMPILATION_MODE_ProductionDebug = singlefile
SWIFT_COMPILATION_MODE_ProductionRelease = wholemodule
SWIFT_COMPILATION_MODE = $(SWIFT_COMPILATION_MODE_$(CONFIGURATION))

SWIFT_OPTIMIZATION_LEVEL_Debug = -Onone
SWIFT_OPTIMIZATION_LEVEL_Release = -Osize
SWIFT_OPTIMIZATION_LEVEL_ProductionDebug = -Onone
SWIFT_OPTIMIZATION_LEVEL_ProductionRelease = -Osize
SWIFT_OPTIMIZATION_LEVEL = $(SWIFT_OPTIMIZATION_LEVEL_$(CONFIGURATION))

SWIFT_TREAT_WARNINGS_AS_ERRORS_Debug = NO
SWIFT_TREAT_WARNINGS_AS_ERRORS_Release = YES
SWIFT_TREAT_WARNINGS_AS_ERRORS_ProductionDebug = NO
SWIFT_TREAT_WARNINGS_AS_ERRORS_ProductionRelease = YES
SWIFT_TREAT_WARNINGS_AS_ERRORS = $(SWIFT_TREAT_WARNINGS_AS_ERRORS_$(CONFIGURATION))

ONLY_ACTIVE_ARCH_Debug = YES
ONLY_ACTIVE_ARCH_Release = YES
ONLY_ACTIVE_ARCH_ProductionDebug = YES
ONLY_ACTIVE_ARCH_ProductionRelease = NO
ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION))

OTHER_SWIFT_FLAGS_Debug = // -driver-show-incremental // -Xfrontend -debug-time-function-bodies
OTHER_SWIFT_FLAGS_Release =
OTHER_SWIFT_FLAGS_ProductionDebug =
OTHER_SWIFT_FLAGS_ProductionRelease =
OTHER_SWIFT_FLAGS = $(OTHER_SWIFT_FLAGS_$(CONFIGURATION))

VALIDATE_PRODUCT_Debug = NO
VALIDATE_PRODUCT_Release = YES
VALIDATE_PRODUCT_ProductionDebug = NO
VALIDATE_PRODUCT_ProductionRelease = YES
VALIDATE_PRODUCT = $(VALIDATE_PRODUCT_$(CONFIGURATION))

// Apple bug. See: https://forums.swift.org/t/impossible-unit-test-crash-with-generic-class-in-swift-package/31167
DEAD_CODE_STRIPPING = NO
8 changes: 0 additions & 8 deletions Configuration/Project.xcconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
//
// Project.xcconfig
// Attenuator
//
// Created by Vlad Gorlov on 25.06.17.
// Copyright © 2017 WaveLabs. All rights reserved.
//

#include "Version.xcconfig"

CURRENT_PROJECT_VERSION = $(APP_BUNDLE_VERSION)
Expand Down
12 changes: 2 additions & 10 deletions Configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
//
// Version.xcconfig
// Attenuator
//
// Created by Vlad Gorlov on 10/10/2016.
// Copyright © 2016 WaveLabs. All rights reserved.
//

APP_BUNDLE_VERSION=41
APP_PROJECT_VERSION=1.2.3
APP_BUNDLE_VERSION=42
APP_PROJECT_VERSION=1.2.4
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ Selecting **Preset** will activate corresponding **Factory** preset.

## Build system and Deployment target requirements

- Xcode 11.4 (Swift 5.2)
- Xcode 11.5

28 changes: 28 additions & 0 deletions Scripts/standalone.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env ruby

require 'fileutils'

srcRoot = File.realpath(File.dirname(File.dirname(__FILE__)))
projectPath = "#{srcRoot}/Shared.xcodeproj/project.pbxproj"
vendorPath = "#{srcRoot}/Vendor/mc"
contents = File.read(projectPath)
matches = contents.scan(/\.\.\/\.\.\/\.\.\/\.\.\/Projects\/mc\/(\w+)\/Sources/)
if matches.count == 0
puts "➔ Nothing to do!"
exit 0
end
if Dir.exists?(vendorPath)
FileUtils.rm_r(vendorPath)
end
FileUtils.mkdir_p vendorPath
matches.each { |m|
moduleName = m[0]
from = "#{ENV["AWL_LIB_SRC"]}/#{moduleName}/Sources"
toDir = "#{vendorPath}/#{moduleName}"
to = "#{toDir}/Sources"
FileUtils.mkdir_p(toDir)
puts "➔ Copying '#{from}' to '#{to}'"
FileUtils.cp_r from, to
}
contents = contents.gsub(/\.\.\/\.\.\/\.\.\/\.\.\/Projects\/mc\//, './mc/')
File.write(projectPath, contents)
Loading

0 comments on commit 7c172dd

Please sign in to comment.