From 362c71ee2ed8da57ee2ad9c919ba871a1b36a082 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Sat, 31 Jan 2015 18:11:26 +0800 Subject: [PATCH] Added build date to version.txt and use CMakeLists.txt to build that, too. --- CMakeLists.txt | 13 +- .../xcode/tidy/tidy.xcodeproj/project.pbxproj | 239 ------------------ .../contents.xcworkspacedata | 7 - .../UserInterfaceState.xcuserstate | Bin 4126 -> 0 bytes .../xcschemes/tidy.xcscheme | 43 ---- build/xcode/tidylib/Info.plist | 28 -- build/xcode/tidylib/tidylib.h | 19 -- version.txt | 3 +- 8 files changed, 11 insertions(+), 341 deletions(-) delete mode 100644 build/xcode/tidy/tidy.xcodeproj/project.pbxproj delete mode 100644 build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/xcuserdata/jderry.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 build/xcode/tidy/tidy.xcodeproj/xcuserdata/jderry.xcuserdatad/xcschemes/tidy.xcscheme delete mode 100644 build/xcode/tidylib/Info.plist delete mode 100644 build/xcode/tidylib/tidylib.h diff --git a/CMakeLists.txt b/CMakeLists.txt index bb2e0e2..2489ce0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,16 +9,21 @@ file(READ version.txt versionFile) if (NOT versionFile) message(FATAL_ERROR "Unable to determine libtidy version. version.txt file is missing.") endif() -string(STRIP "${versionFile}" LIBTIDY_VERSION) +string(STRIP "${versionFile}" versionFile) +string(REGEX REPLACE "(.*)[\r\n|\n](.*)" "\\1" LIBTIDY_VERSION ${versionFile}) +string(REGEX REPLACE "(.*)[\r\n|\n](.*)" "\\2" LIBTIDY_DATE ${versionFile}) + +# establish version number string(REPLACE "." ";" VERSION_LIST ${LIBTIDY_VERSION}) list(GET VERSION_LIST 0 TIDY_MAJOR_VERSION) list(GET VERSION_LIST 1 TIDY_MINOR_VERSION) list(GET VERSION_LIST 2 TIDY_POINT_VERSION) # establish version date -set( tidy_YEAR 2015 ) -set( tidy_MONTH 01 ) -set( tidy_DAY 20 ) +string(REPLACE "." ";" VERSION_LIST ${LIBTIDY_DATE}) +list(GET VERSION_LIST 0 tidy_YEAR) +list(GET VERSION_LIST 1 tidy_MONTH) +list(GET VERSION_LIST 2 tidy_DAY) # Allow developer to select is Dynamic or static library built set( LIB_TYPE STATIC ) # set default static diff --git a/build/xcode/tidy/tidy.xcodeproj/project.pbxproj b/build/xcode/tidy/tidy.xcodeproj/project.pbxproj deleted file mode 100644 index 808524c..0000000 --- a/build/xcode/tidy/tidy.xcodeproj/project.pbxproj +++ /dev/null @@ -1,239 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - D03019FF1A7CAEEF00D9DCB5 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = D03019FE1A7CAEEF00D9DCB5 /* main.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - D03019F91A7CAEEF00D9DCB5 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - D03019FB1A7CAEEF00D9DCB5 /* tidy */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tidy; sourceTree = BUILT_PRODUCTS_DIR; }; - D03019FE1A7CAEEF00D9DCB5 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - D03019F81A7CAEEF00D9DCB5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - D03019F21A7CAEEF00D9DCB5 = { - isa = PBXGroup; - children = ( - D03019FD1A7CAEEF00D9DCB5 /* tidy */, - D03019FC1A7CAEEF00D9DCB5 /* Products */, - ); - sourceTree = ""; - }; - D03019FC1A7CAEEF00D9DCB5 /* Products */ = { - isa = PBXGroup; - children = ( - D03019FB1A7CAEEF00D9DCB5 /* tidy */, - ); - name = Products; - sourceTree = ""; - }; - D03019FD1A7CAEEF00D9DCB5 /* tidy */ = { - isa = PBXGroup; - children = ( - D03019FE1A7CAEEF00D9DCB5 /* main.c */, - ); - path = tidy; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - D03019FA1A7CAEEF00D9DCB5 /* tidy */ = { - isa = PBXNativeTarget; - buildConfigurationList = D0301A021A7CAEEF00D9DCB5 /* Build configuration list for PBXNativeTarget "tidy" */; - buildPhases = ( - D03019F71A7CAEEF00D9DCB5 /* Sources */, - D03019F81A7CAEEF00D9DCB5 /* Frameworks */, - D03019F91A7CAEEF00D9DCB5 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = tidy; - productName = tidy; - productReference = D03019FB1A7CAEEF00D9DCB5 /* tidy */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - D03019F31A7CAEEF00D9DCB5 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0610; - ORGANIZATIONNAME = HTACG; - TargetAttributes = { - D03019FA1A7CAEEF00D9DCB5 = { - CreatedOnToolsVersion = 6.1.1; - }; - }; - }; - buildConfigurationList = D03019F61A7CAEEF00D9DCB5 /* Build configuration list for PBXProject "tidy" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = D03019F21A7CAEEF00D9DCB5; - productRefGroup = D03019FC1A7CAEEF00D9DCB5 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - D03019FA1A7CAEEF00D9DCB5 /* tidy */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - D03019F71A7CAEEF00D9DCB5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D03019FF1A7CAEEF00D9DCB5 /* main.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - D0301A001A7CAEEF00D9DCB5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - 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_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - D0301A011A7CAEEF00D9DCB5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - 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_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - }; - name = Release; - }; - D0301A031A7CAEEF00D9DCB5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - D0301A041A7CAEEF00D9DCB5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - D03019F61A7CAEEF00D9DCB5 /* Build configuration list for PBXProject "tidy" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D0301A001A7CAEEF00D9DCB5 /* Debug */, - D0301A011A7CAEEF00D9DCB5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D0301A021A7CAEEF00D9DCB5 /* Build configuration list for PBXNativeTarget "tidy" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D0301A031A7CAEEF00D9DCB5 /* Debug */, - D0301A041A7CAEEF00D9DCB5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; -/* End XCConfigurationList section */ - }; - rootObject = D03019F31A7CAEEF00D9DCB5 /* Project object */; -} diff --git a/build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index b28659b..0000000 --- a/build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/xcuserdata/jderry.xcuserdatad/UserInterfaceState.xcuserstate b/build/xcode/tidy/tidy.xcodeproj/project.xcworkspace/xcuserdata/jderry.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index ac86642b4c71f01764ea96f815f09f90c25992ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4126 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 L2J;&IwSWD8_n5^8 diff --git a/build/xcode/tidy/tidy.xcodeproj/xcuserdata/jderry.xcuserdatad/xcschemes/tidy.xcscheme b/build/xcode/tidy/tidy.xcodeproj/xcuserdata/jderry.xcuserdatad/xcschemes/tidy.xcscheme deleted file mode 100644 index b59f83d..0000000 --- a/build/xcode/tidy/tidy.xcodeproj/xcuserdata/jderry.xcuserdatad/xcschemes/tidy.xcscheme +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/build/xcode/tidylib/Info.plist b/build/xcode/tidylib/Info.plist deleted file mode 100644 index 48f32ec..0000000 --- a/build/xcode/tidylib/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.htacg.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2015 HTACG. All rights reserved. - NSPrincipalClass - - - diff --git a/build/xcode/tidylib/tidylib.h b/build/xcode/tidylib/tidylib.h deleted file mode 100644 index 46d41ca..0000000 --- a/build/xcode/tidylib/tidylib.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// tidylib.h -// tidylib -// -// Created by Jim Derry on 1/31/15. -// Copyright (c) 2015 HTACG. All rights reserved. -// - -#import - -//! Project version number for tidylib. -FOUNDATION_EXPORT double tidylibVersionNumber; - -//! Project version string for tidylib. -FOUNDATION_EXPORT const unsigned char tidylibVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/version.txt b/version.txt index dad10c7..7ac679f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1,2 @@ -4.9.2 +4.9.3 +2015.01.31 \ No newline at end of file