Changeset ae0d420 for launchers/macosx


Ignore:
Timestamp:
Sep 30, 2018 9:35:28 AM (22 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
36b758f
Parents:
b40b987
Message:

Mac OSX Launcher:

  • Added script to check for latest java via xcode
  • Updated xcode project metadata files
  • Update dmg create script
  • Make xcode write version.h under build
  • Added template for version.h
Location:
launchers/macosx
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj

    rb40b987 rae0d420  
    1010                BF07789721506C810014EB07 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF07789621506C810014EB07 /* Storyboard.storyboard */; };
    1111                BF07789E21506D2B0014EB07 /* PopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF07789C21506D2B0014EB07 /* PopoverViewController.swift */; };
     12                BF14B70F215C98DC0014EB07 /* LoggerWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF14B70D215C98DC0014EB07 /* LoggerWorker.cpp */; };
     13                BF14B710215C98DC0014EB07 /* Logger.mm in Sources */ = {isa = PBXBuildFile; fileRef = BF14B70E215C98DC0014EB07 /* Logger.mm */; };
     14                BF14B712215D9E040014EB07 /* FolderContentMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */; };
    1215                BF1EFA3A215140E60014EB07 /* SBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = BF1EFA39215140E60014EB07 /* SBridge.mm */; };
    1316                BF1EFA40215141110014EB07 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BF1EFA3D215141100014EB07 /* main.mm */; };
     
    1518                BF1EFA47215141640014EB07 /* base.zip in Resources */ = {isa = PBXBuildFile; fileRef = BF1EFA44215141630014EB07 /* base.zip */; };
    1619                BF1EFA48215141640014EB07 /* ItoopieTransparent.png in Resources */ = {isa = PBXBuildFile; fileRef = BF1EFA45215141640014EB07 /* ItoopieTransparent.png */; };
     20                BF3143FE2160C1BD0014EB07 /* DownloadJavaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3143FD2160C1BD0014EB07 /* DownloadJavaViewController.swift */; };
     21                BF4AA39F215AA58B0014EB07 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF4AA39E215AA58B0014EB07 /* NetworkExtension.framework */; };
    1722                BF5061702113C48E0014EB07 /* I2PLauncher.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BF50616E2113C48E0014EB07 /* I2PLauncher.xcdatamodeld */; };
    1823                BF5061722113C4900014EB07 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BF5061712113C4900014EB07 /* Assets.xcassets */; };
     
    2025                BF5061962113C84E0014EB07 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5061952113C84E0014EB07 /* Cocoa.framework */; };
    2126                BF5315072150C55B0014EB07 /* RouterRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5315062150C55B0014EB07 /* RouterRunner.swift */; };
    22                 BF5315092150C6760014EB07 /* RouterDeployer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5315082150C6760014EB07 /* RouterDeployer.swift */; };
    2327                BF53150B2150C6E80014EB07 /* I2PSubprocess.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF53150A2150C6E80014EB07 /* I2PSubprocess.swift */; };
    2428                BF53150D2150CE310014EB07 /* DateTimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF53150C2150CE310014EB07 /* DateTimeUtils.swift */; };
     
    4751                BFE16BF82156C61E0014EB07 /* RouterStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE16BF72156C61E0014EB07 /* RouterStatusView.swift */; };
    4852                BFE16BFA2156DAED0014EB07 /* EventManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE16BF92156DAED0014EB07 /* EventManager.swift */; };
     53                BFE16BFE2156FD2A0014EB07 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFE16BFD2156FD290014EB07 /* Sparkle.framework */; };
     54                BFE16C002156FD9E0014EB07 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BFE16BFD2156FD290014EB07 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
    4955                BFE1CBAD2151908F0014EB07 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFE1CBAC2151908F0014EB07 /* CoreFoundation.framework */; };
    50                 BFF4581C213C48EA0014EB07 /* EventMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF4581B213C48EA0014EB07 /* EventMonitor.swift */; };
    5156/* End PBXBuildFile section */
     57
     58/* Begin PBXCopyFilesBuildPhase section */
     59                BFE16BFF2156FD890014EB07 /* CopyFiles */ = {
     60                        isa = PBXCopyFilesBuildPhase;
     61                        buildActionMask = 2147483647;
     62                        dstPath = "";
     63                        dstSubfolderSpec = 10;
     64                        files = (
     65                                BFE16C002156FD9E0014EB07 /* Sparkle.framework in CopyFiles */,
     66                        );
     67                        runOnlyForDeploymentPostprocessing = 0;
     68                };
     69/* End PBXCopyFilesBuildPhase section */
    5270
    5371/* Begin PBXFileReference section */
    5472                BF07789621506C810014EB07 /* Storyboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = "<group>"; };
    5573                BF07789C21506D2B0014EB07 /* PopoverViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverViewController.swift; sourceTree = "<group>"; };
     74                BF14B70B215C98DC0014EB07 /* LoggerWorker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LoggerWorker.hpp; sourceTree = SOURCE_ROOT; };
     75                BF14B70C215C98DC0014EB07 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = SOURCE_ROOT; };
     76                BF14B70D215C98DC0014EB07 /* LoggerWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoggerWorker.cpp; sourceTree = SOURCE_ROOT; };
     77                BF14B70E215C98DC0014EB07 /* Logger.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logger.mm; sourceTree = SOURCE_ROOT; };
     78                BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderContentMonitor.swift; sourceTree = "<group>"; };
     79                BF14B714215DA3330014EB07 /* version.h.tpl */ = {isa = PBXFileReference; lastKnownFileType = text; path = version.h.tpl; sourceTree = "<group>"; };
    5680                BF1EFA38215140E60014EB07 /* SBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBridge.h; sourceTree = SOURCE_ROOT; };
    5781                BF1EFA39215140E60014EB07 /* SBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SBridge.mm; sourceTree = SOURCE_ROOT; };
     
    6488                BF1EFA45215141640014EB07 /* ItoopieTransparent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ItoopieTransparent.png; sourceTree = "<group>"; };
    6589                BF1EFA46215141640014EB07 /* launcher.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = launcher.jar; sourceTree = "<group>"; };
     90                BF3143FD2160C1BD0014EB07 /* DownloadJavaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadJavaViewController.swift; sourceTree = "<group>"; };
     91                BF3143FF2160CA350014EB07 /* logger_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = logger_c.h; sourceTree = "<group>"; };
     92                BF4AA39E215AA58B0014EB07 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/NetworkExtension.framework; sourceTree = DEVELOPER_DIR; };
    6693                BF5061682113C48E0014EB07 /* I2PLauncher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = I2PLauncher.app; sourceTree = BUILT_PRODUCTS_DIR; };
    6794                BF50616F2113C48E0014EB07 /* I2PLauncher.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = I2PLauncher.xcdatamodel; sourceTree = "<group>"; };
     
    7299                BF5061952113C84E0014EB07 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
    73100                BF5315062150C55B0014EB07 /* RouterRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterRunner.swift; sourceTree = "<group>"; };
    74                 BF5315082150C6760014EB07 /* RouterDeployer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterDeployer.swift; sourceTree = "<group>"; };
    75101                BF53150A2150C6E80014EB07 /* I2PSubprocess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = I2PSubprocess.swift; sourceTree = "<group>"; };
    76102                BF53150C2150CE310014EB07 /* DateTimeUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimeUtils.swift; sourceTree = "<group>"; };
     
    101127                BFE16BF72156C61E0014EB07 /* RouterStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterStatusView.swift; sourceTree = "<group>"; };
    102128                BFE16BF92156DAED0014EB07 /* EventManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventManager.swift; sourceTree = "<group>"; };
    103                 BFE16BFB2156E94E0014EB07 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../../Sparkle/build/Release/Sparkle.framework; sourceTree = "<group>"; };
     129                BFE16BFD2156FD290014EB07 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
    104130                BFE1CBAC2151908F0014EB07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
    105131                BFF45818213C428E0014EB07 /* I2PLauncher-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "I2PLauncher-Bridging-Header.h"; sourceTree = "<group>"; };
    106                 BFF4581B213C48EA0014EB07 /* EventMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMonitor.swift; sourceTree = "<group>"; };
    107132/* End PBXFileReference section */
    108133
     
    113138                        files = (
    114139                                BFE1CBAD2151908F0014EB07 /* CoreFoundation.framework in Frameworks */,
     140                                BF4AA39F215AA58B0014EB07 /* NetworkExtension.framework in Frameworks */,
    115141                                BF865417215182820014EB07 /* Foundation.framework in Frameworks */,
     142                                BFE16BFE2156FD2A0014EB07 /* Sparkle.framework in Frameworks */,
    116143                                BFBDCB0021505BEE0014EB07 /* AppKit.framework in Frameworks */,
    117144                                BF5061962113C84E0014EB07 /* Cocoa.framework in Frameworks */,
     
    143170                                BF531514215105B40014EB07 /* LogViewController.swift */,
    144171                                BFE16BF72156C61E0014EB07 /* RouterStatusView.swift */,
     172                                BF3143FD2160C1BD0014EB07 /* DownloadJavaViewController.swift */,
    145173                        );
    146174                        path = userinterface;
     
    150178                        isa = PBXGroup;
    151179                        children = (
     180                                BF14B714215DA3330014EB07 /* version.h.tpl */,
    152181                                BF1EFA44215141630014EB07 /* base.zip */,
    153182                                BF1EFA45215141640014EB07 /* ItoopieTransparent.png */,
     
    170199                        isa = PBXGroup;
    171200                        children = (
     201                                BF14B70E215C98DC0014EB07 /* Logger.mm */,
     202                                BF14B70C215C98DC0014EB07 /* Logger.h */,
     203                                BF14B70D215C98DC0014EB07 /* LoggerWorker.cpp */,
     204                                BF14B70B215C98DC0014EB07 /* LoggerWorker.hpp */,
    172205                                BF650CA52152AC7D0014EB07 /* bumpInfoPlist.sh */,
    173206                                BF650CA82152AC7D0014EB07 /* Deployer.h */,
     
    176209                                BF1EFA42215141220014EB07 /* include */,
    177210                                BF1EFA3F215141110014EB07 /* AppDelegate.h */,
     211                                BF3143FF2160CA350014EB07 /* logger_c.h */,
    178212                                BF1EFA3D215141100014EB07 /* main.mm */,
    179213                                BF1EFA3B215141100014EB07 /* RouterTask.h */,
     
    200234                        isa = PBXGroup;
    201235                        children = (
    202                                 BFE16BFB2156E94E0014EB07 /* Sparkle.framework */,
     236                                BF4AA39E215AA58B0014EB07 /* NetworkExtension.framework */,
     237                                BFE16BFD2156FD290014EB07 /* Sparkle.framework */,
    203238                                BFE1CBAC2151908F0014EB07 /* CoreFoundation.framework */,
    204239                                BF865416215182820014EB07 /* Foundation.framework */,
     
    217252                                BF5315122150EB510014EB07 /* RouterProcessStatus+ObjectiveC.swift */,
    218253                                BF5315062150C55B0014EB07 /* RouterRunner.swift */,
    219                                 BF5315082150C6760014EB07 /* RouterDeployer.swift */,
    220254                                BF53150A2150C6E80014EB07 /* I2PSubprocess.swift */,
    221255                                BFDD81D92156B3E30014EB07 /* RouterManager.swift */,
     
    227261                        isa = PBXGroup;
    228262                        children = (
    229                                 BFF4581B213C48EA0014EB07 /* EventMonitor.swift */,
    230263                                BFBDCAF9215050810014EB07 /* ReflectionFunctions.swift */,
    231264                                BFBDCAF52150428D0014EB07 /* StringExtensions.swift */,
     
    233266                                BF53150C2150CE310014EB07 /* DateTimeUtils.swift */,
    234267                                BFE16BF92156DAED0014EB07 /* EventManager.swift */,
     268                                BF14B711215D9E040014EB07 /* FolderContentMonitor.swift */,
    235269                        );
    236270                        path = Utils;
     
    244278                        buildConfigurationList = BF50617C2113C4900014EB07 /* Build configuration list for PBXNativeTarget "I2PLauncher" */;
    245279                        buildPhases = (
     280                                BF14B713215DA1460014EB07 /* ShellScript */,
    246281                                BF5061642113C48E0014EB07 /* Sources */,
    247282                                BF5061652113C48E0014EB07 /* Frameworks */,
    248283                                BF1EFA4B215142030014EB07 /* ShellScript */,
    249284                                BF5061662113C48E0014EB07 /* Resources */,
     285                                BFE16BFF2156FD890014EB07 /* CopyFiles */,
    250286                        );
    251287                        buildRules = (
     
    276312                                                                enabled = 0;
    277313                                                        };
     314                                                        com.apple.HardenedRuntime = {
     315                                                                enabled = 1;
     316                                                        };
    278317                                                        com.apple.NetworkExtensions = {
    279                                                                 enabled = 0;
     318                                                                enabled = 1;
    280319                                                        };
    281320                                                        com.apple.Sandbox = {
     
    323362
    324363/* Begin PBXShellScriptBuildPhase section */
     364                BF14B713215DA1460014EB07 /* ShellScript */ = {
     365                        isa = PBXShellScriptBuildPhase;
     366                        buildActionMask = 2147483647;
     367                        files = (
     368                        );
     369                        inputFileListPaths = (
     370                        );
     371                        inputPaths = (
     372                        );
     373                        outputFileListPaths = (
     374                        );
     375                        outputPaths = (
     376                        );
     377                        runOnlyForDeploymentPostprocessing = 0;
     378                        shellPath = /bin/sh;
     379                        shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=`/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${INFOPLIST_FILE}\"`\ncommit=`mtn heads --branch=i2p.i2p | awk '{ print $1 }' | head -n 1`\nbuildinfo=\"Built $(date), $commit\"\n\n# Use cat to avoid any potential alias of cp asking for overwrite of file.\ncat $SRCROOT/version.h.tpl > $SRCROOT/version.h\nsed -i '' \"s#VERSION_REPLACED_BY_XCODE_BUILD_SCRIPT#$version#\" $SRCROOT/version.h\nsed -i '' \"s#BUILD_INFO_REPLACED_BY_XCODE_BUILD_SCRIPT#$buildinfo#\" $SRCROOT/version.h\n\n$SRCROOT/check_latest_java.sh\n\n";
     380                };
    325381                BF1EFA4B215142030014EB07 /* ShellScript */ = {
    326382                        isa = PBXShellScriptBuildPhase;
     
    334390                        runOnlyForDeploymentPostprocessing = 0;
    335391                        shellPath = /bin/sh;
    336                         shellScript = "# Run from launchers/macosx\nexport BUILDDIR=$(pwd)\ncd ..\nsbt macosx:assembly\ncd ..\nant preppkg-osx\ncd pkg-temp\nrm -f ../base.zip\nzip -r -v -9 ../base.zip *\ncp ../base.zip $BUILDDIR/base.zip\ncd $BUILDDIR\ncp $BUILDDIR/target/scala-2.11/routerLauncher-assembly-0.1.0-SNAPSHOT.jar $BUILDDIR/launcher.jar\n\n\n\n";
     392                        shellScript = "# Run from launchers/macosx\nset -x\n\n# Warning to keep clean files\nfind \"${SRCROOT}\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 wc -l | awk '$1 > 200 && $2 != \"total\" { print $2 \":1: warning: file more than 200 lines\" }'\n\nexport BUILDDIR=$(pwd)\nexport MACOSX_SOURCE_DIR=$SRCROOT\nexport I2P_SOURCE_DIR=$(realpath $SRCROOT/../..)\ncd $MACOSX_SOURCE_DIR/..\n# TODO: Find out why sbt hangs when executed in cli\n#./sbt \";macosx:assembly\"\ncd ..\ncd $I2P_SOURCE_DIR\nant preppkg-osx\ncd pkg-temp\nrm -f $BUILDDIR/base.zip\nzip -r -v -9 $BUILDDIR/base.zip *\ncd $MACOSX_SOURCE_DIR\ncp $MACOSX_SOURCE_DIR/target/scala-2.11/routerLauncher-assembly-0.1.0-SNAPSHOT.jar $BUILDDIR/launcher.jar\n\n\n";
    337393                };
    338394/* End PBXShellScriptBuildPhase section */
     
    348404                                BFE16BFA2156DAED0014EB07 /* EventManager.swift in Sources */,
    349405                                BFBDCAF12150420C0014EB07 /* ExecutionResult.swift in Sources */,
    350                                 BF5315092150C6760014EB07 /* RouterDeployer.swift in Sources */,
    351406                                BFE16BF82156C61E0014EB07 /* RouterStatusView.swift in Sources */,
    352407                                BFBDCAEF215041E30014EB07 /* Error.swift in Sources */,
     
    361416                                BF1EFA40215141110014EB07 /* main.mm in Sources */,
    362417                                BFBDCAF4215042670014EB07 /* AppleStuffExceptionHandler.m in Sources */,
     418                                BF3143FE2160C1BD0014EB07 /* DownloadJavaViewController.swift in Sources */,
    363419                                BF531515215105B40014EB07 /* LogViewController.swift in Sources */,
    364420                                BF5315132150EB510014EB07 /* RouterProcessStatus+ObjectiveC.swift in Sources */,
     421                                BF14B712215D9E040014EB07 /* FolderContentMonitor.swift in Sources */,
    365422                                BFBDCAFE2150567D0014EB07 /* SwiftMainDelegate.swift in Sources */,
    366423                                BFDD81DA2156B3E30014EB07 /* RouterManager.swift in Sources */,
    367424                                BF53150B2150C6E80014EB07 /* I2PSubprocess.swift in Sources */,
    368                                 BFF4581C213C48EA0014EB07 /* EventMonitor.swift in Sources */,
    369425                                BF1EFA3A215140E60014EB07 /* SBridge.mm in Sources */,
     426                                BF14B70F215C98DC0014EB07 /* LoggerWorker.cpp in Sources */,
     427                                BF14B710215C98DC0014EB07 /* Logger.mm in Sources */,
    370428                                BFBDCAF62150428D0014EB07 /* StringExtensions.swift in Sources */,
    371429                                BF5061702113C48E0014EB07 /* I2PLauncher.xcdatamodeld in Sources */,
     
    507565                                CODE_SIGN_STYLE = Automatic;
    508566                                COMBINE_HIDPI_IMAGES = YES;
     567                                COPY_PHASE_STRIP = YES;
    509568                                DEAD_CODE_STRIPPING = YES;
    510569                                DEFINES_MODULE = YES;
    511570                                DEVELOPMENT_TEAM = W3C42P2LA8;
     571                                ENABLE_HARDENED_RUNTIME = YES;
    512572                                FRAMEWORK_SEARCH_PATHS = (
    513573                                        /Library/Frameworks,
    514574                                        /System/Library/Frameworks,
     575                                        "$(PROJECT_DIR)",
    515576                                );
    516                                 HEADER_SEARCH_PATHS = (
    517                                         "$(SRCROOT)/include",
    518                                         "$(SRCROOT)/include/neither",
    519                                 );
     577                                HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
    520578                                INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = include;
    521579                                INFOPLIST_FILE = I2PLauncher/Info.plist;
    522580                                LD_NO_PIE = YES;
    523                                 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks";
     581                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks @loader_path/../Frameworks";
    524582                                MACOSX_DEPLOYMENT_TARGET = 10.11;
    525583                                PRODUCT_BUNDLE_IDENTIFIER = net.i2p.bootstrap.macosx.I2PLauncher;
     
    543601                                CODE_SIGN_STYLE = Automatic;
    544602                                COMBINE_HIDPI_IMAGES = YES;
     603                                COPY_PHASE_STRIP = YES;
    545604                                DEAD_CODE_STRIPPING = YES;
    546605                                DEFINES_MODULE = YES;
    547606                                DEVELOPMENT_TEAM = W3C42P2LA8;
     607                                ENABLE_HARDENED_RUNTIME = YES;
    548608                                FRAMEWORK_SEARCH_PATHS = (
    549609                                        /Library/Frameworks,
    550610                                        /System/Library/Frameworks,
     611                                        "$(PROJECT_DIR)",
    551612                                );
    552                                 HEADER_SEARCH_PATHS = (
    553                                         "$(SRCROOT)/include",
    554                                         "$(SRCROOT)/include/neither",
    555                                 );
     613                                HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
    556614                                INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = include;
    557615                                INFOPLIST_FILE = I2PLauncher/Info.plist;
    558616                                LD_NO_PIE = YES;
    559                                 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks";
     617                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/Frameworks @loader_path/../Frameworks";
    560618                                MACOSX_DEPLOYMENT_TARGET = 10.11;
    561619                                PRODUCT_BUNDLE_IDENTIFIER = net.i2p.bootstrap.macosx.I2PLauncher;
  • launchers/macosx/osx_create_dmg.sh

    rb40b987 rae0d420  
    1 #!/bin/bash
     1#!/usr/bin/env bash
     2DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
    23
    34. .sign-secrets
     
    56APP_NAME="I2PLauncher"
    67VERSION="0.9.36"
    7 DMG_BACKGROUND_IMG="Background.png"
     8DMG_BACKGROUND_IMG="${DIR}/Background.png"
    89
    910APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_NAME}"
     
    6263pushd /Volumes/"${VOL_NAME}"
    6364ln -s /Applications
    64 popd
    6565
    6666# add a background image
Note: See TracChangeset for help on using the changeset viewer.