From 17c330afa72070a7b26d1ea619ab33e06cba2a99 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 12 Jan 2017 20:49:16 +0100 Subject: [PATCH] [platform] updates macOS restarter - minor optimization - build script instead of a monstrous XCode project - system requirements lifted --- bin/mac/restarter | Bin 13556 -> 8840 bytes native/restarter/.gitignore | 9 - native/restarter/make.sh | 3 + native/restarter/restarter.m | 9 +- .../restarter.xcodeproj/project.pbxproj | 211 ------------------ 5 files changed, 6 insertions(+), 226 deletions(-) delete mode 100644 native/restarter/.gitignore create mode 100755 native/restarter/make.sh delete mode 100644 native/restarter/restarter.xcodeproj/project.pbxproj diff --git a/bin/mac/restarter b/bin/mac/restarter index 6c093cdf119b6c77d875f31ebab30c0ff07f2265..f026d9472c06b03e89b52190c9b33e762057f611 100755 GIT binary patch literal 8840 zcmeHMU2GIp6uw(P)>7y~ivh%BL8@r9i;0_HdFfIH2We?xTmBNgo!uR}1H0SJ%q+Af zXhYSo+0-=A@TQ_M#s?F5?1K+PP3nUNLK@O255yp86EuBLQw>tTbLUQXceeD^n9NDe zoO|v$=ezfwb9Z<4-fMsV`d~F_Wm??DFD$vChHUAU#~&4G2oS^85&or}a!;H{s;PyDIToB>?G^_eH9i-(cc& zl4o^0ozt><4c>1O?+pn+dL>n1!@zkVch1PAxRE)jWE!3IQq74-_hL8}=gGOA z=BG@Wnjr6bCnR3GV`ijduRWA#pG>26obQYE#wy&fA4Eyred3X{PY9Rx3K8eI47Y}} ziNOrd+vY>@To~GKmGh!{R_dH*wB_(Zh^P5&qQOC=SH`>h*s;?5L|u)nHlR}}yzAX5 z@q#jd^yTXy@GL!J>Zh=sy?DDM-foFUdgc6(H}sTA&M%qKEQ=7mcxj0jmLa59;-R|= zulzmIdEn4NW#0k!I{*Mxb(Me@I8w08NXAG+Qp1@PbfU+> zG>`jdZ(X=H7d`pu?|)3Z|L27dcAzf=WeL6?iS<$(eUDWVjdL7KHkva# zd>bWvo<-urmaS(aokqgc%;Cs>`e>dTG|yO(SU!Kyuv^84m3ksab<;8ib5^87+5khi zyTOaN><+X*c}-Xs?X=cdD^_PDU=&mvcXOpT&Y4>4-pWXdOM@53+qw_yxU}3lItERB z|6n1P(rnCrsrAGn)jq(dar!IA*{ook=K{;*YxyxcB4s;pp8``ILvnvSBX!z$KKU8& zGvH^y&%pmL1AS`o7j^Vr|D1uNDh)qvz-A8pr521^oet*`s()D)+)4uVynR z(H@--G`>YY2&MD)X1dW)RKA-1d0}BeguZ(N7PYkME`GYzQrDbXIvi3<(T_+iPR=yJ zUo9%P;qkrjh>l6iUldnVrYDstdfO@~Q+t&8#<4>JPMKCqYu_W!WZ#rpDgd_mCSX+& zd<}6|W+sGZR1vUUSJWc9zn=NT!5Y09C@NF4pJAF9`h@W5!z{W09Ni*NCTGqPLQ(ln zEfGi8$ZjrxS2c?uv7#WXKZun~&cvLctAMQ+9?_qq}p1r%=bm*%aU?m z9sRcd)o;cZT3&<4LQB7RCh%mebL@#28nO67%L|a>^e(|>?_vdMf|1(bVfSXmLb=*N?EkP$&>;SREY40Q5dd*y=x6F39~K%wp?8@6>gy zb^oVQ>{4_cW79l;l=6<0}e;*!p(fz4w(4-q9J0$N3I^C|*9wIBbpt z#+%ydHcQ-=^8_xCal1V-|G+t9SO|d#=|*(VIy-A1u!)} zbOggjg5zdrL%VZjnzaVvdM?GrnYpQ{oe$`CK5qy$47FfobUhEFO975M;X0m8bA3op z7Hl1N^BT>5TUIl2tc4C=R}pM(J55Wn|MN@;~ha4@q|vp3c7@6rTs&XPWPg8mJ4Qe88*JT+U1{R@t8b^!nY literal 13556 zcmeHOU2Ggz6~5~%%_iB{TZq&MOxeJuYEkM`9nmQ;$^M9MNX4FaC{k*pR89uPumRS++!93@p7AwUAe3sh<=+0+%55~L^soA1nz zJ-c38@B%`bE1#L~o_o)^XTE!P_RjjuukU}jxREio0n!2aDC7VXR~SnqfcHT-AMSg) z@Rh=|M^On&CIqX`WcMNtoR1d9MczP&F4%m3oLjX@(a^YMJ4Gm4eVloiu^jYgI&p!a5zeW=#{-@X8S}Exs>1Z@&DU`m zJ_ew_3?IbVa%qY~wro??OF?669B;wLhiH2XKB6V+k8?*quj&d{^$7!=T7A6!DaHn& zf4wW}p&75tMStIDU!*My9L`5D7qkXwKB#c6)HKD%etorliW*=Wjd{g_eCU`5e>$qR ziF&h-RF<(c3{ovVXbwoIaIQ(~`Pi0aY&-gGYw-#ViM-waSu{n-i@IeC- zpV2tTEyOFFs}+hOSkkMw*bg7HuJ&iw_CY-Q_obm{jvOlVKNH?#4ls6?NP`bL6OYt4 zEEE&1l@!`{l5#KlL5bT58>Tu+ct83WF!kL^$~DT3J&d*c=+Q@-xTLk6cPulnsl|No zal$Rk^V|J(cT@G|?(zC>Z~VDqi}AG_^ce_CZbpEcy*MZ)ir>>y+rLrh9@(x?EaMQm zCU0(bybOjOXZewuWs6FFNG+O@S<4TYQbn9M%t6O0vwYo;{%ndjvM#-0b$(>|;Tl)>m9&24V(c z2L782oMnyo>+dbp=QHlXqyE_76H5Z%z#+K6v2L{k(m*?;FRKF8|KC z(|Dt?mA<4Kcj`~Fsgp_P-ZbqUTr%lc`pq!Z|{$7d$41)qnFvpP@)yL8>!j+79WOjM_j%M1 zZFYJin>_|RJ3wRHOE`aZ3+ejehOQT9sQX~bt>49Cll$!?HVqgu)fmksDW*j`Os4pfj4%Bb{6Aq^?q}{HyJiST-xoL9H5C51{kVHd#4-NHO$s^8; zTmOeQN(P(HB zk4n}g(On~d>`^-$g7a+kpE~S8g&@sn1Psqn1Psqn1Psqn1Psqn1Psqn1Psqn1Psq|0x5V z_#g7)ki(FxkcS}qAqOF&kmn)afxH5t|EJOaJLreOxWo*^48#n?48#n?48#n?48#n? z48#n?48#n?4E+BvaQmUh{+P&hvL7LH;9=wi{2lqDKMnA0WER{E@B;9k0=x+P7vRoK zey%SPNmlE75Ha_ zA(T`58qWB`RWtVc2>x3HZ$ztK#XAN*CTiHz5qu_sCnC5K!BzxcjNq4iOnDsa2NC^e zP^Tmi`dKCm*#XHxJ_*6kHtf@owfdlm@gw7XW=Rgt=a3u2tEN%XkqHc3DRXf_$c`=W zMueo`jR>UB*fMElQKd9qZc3_!u5HzL5ks=qZ{(_ilo-{n!G&hXlU&jyq~w^QszId~ zNa?|Fx?!smHDvZk3im^6Y0(XC2^|3QLB_puAG<5iM@!bq#|qF1X(gI07|El?XpQzqw1>7O~bKO z9fV@)DZ7aa)6@-|yh=&f)vAh#@aDDIz`L@FRT{yhFz#5I5LI~hubXn{y%&3U5wFGI h<(lvvognp#lDN2L7?TccDw3)*&%z%kSiD&8{{k`ai@*Q? diff --git a/native/restarter/.gitignore b/native/restarter/.gitignore deleted file mode 100644 index 4691cba0cd25..000000000000 --- a/native/restarter/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -Debug -Release -_UpgradeReport_Files -*.suo -*.vcxproj.user -UpgradeLog.xml -ipch -*.sdf -xuserdata \ No newline at end of file diff --git a/native/restarter/make.sh b/native/restarter/make.sh new file mode 100755 index 000000000000..6510630e4636 --- /dev/null +++ b/native/restarter/make.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +clang -arch x86_64 -mmacosx-version-min=10.8 -framework AppKit -lobjc -o restarter restarter.m \ No newline at end of file diff --git a/native/restarter/restarter.m b/native/restarter/restarter.m index 3b829e12ff03..11541aa1a06a 100644 --- a/native/restarter/restarter.m +++ b/native/restarter/restarter.m @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,9 @@ int main(int argc, const char *argv[]) { if (argc < 2) return EXIT_FAILURE; - unsigned int interval = 500; // check every 0.5 second - unsigned int slept = 0; + useconds_t interval = 500 * 1000; // check every 0.5 second while (getppid() != 1) { - usleep(interval * 1000); - - slept += interval; + usleep(interval); } if (argc > 2) { diff --git a/native/restarter/restarter.xcodeproj/project.pbxproj b/native/restarter/restarter.xcodeproj/project.pbxproj deleted file mode 100644 index 23c4cc62bed6..000000000000 --- a/native/restarter/restarter.xcodeproj/project.pbxproj +++ /dev/null @@ -1,211 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 3A6C10B4148122790074811C /* restarter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A6C10B3148122790074811C /* restarter.m */; }; - 3A6C10B7148122940074811C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6C10B6148122940074811C /* AppKit.framework */; }; - 3ABC975E16A5A3CD0088619F /* restarter in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3A6C10AE148122660074811C /* restarter */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - CF2F99674C3F98D5739C1B44 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 12; - dstPath = "$(PROJECT_DIR)/../../bin/mac"; - dstSubfolderSpec = 0; - files = ( - 3ABC975E16A5A3CD0088619F /* restarter in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 3A6C10AE148122660074811C /* restarter */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = restarter; sourceTree = BUILT_PRODUCTS_DIR; }; - 3A6C10B3148122790074811C /* restarter.m */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.c.objc; path = restarter.m; sourceTree = ""; }; - 3A6C10B6148122940074811C /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - CF2F99674C3F98D5739C1B43 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3A6C10B7148122940074811C /* AppKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - CF2F99674C3F98D5739C1B39 = { - isa = PBXGroup; - children = ( - 3A6C10B3148122790074811C /* restarter.m */, - CF2F99674C3F98D5739C1B3A /* Products */, - CF2F99674C3F98D5739C1B45 /* Frameworks */, - 3A6C10B6148122940074811C /* AppKit.framework */, - ); - sourceTree = ""; - }; - CF2F99674C3F98D5739C1B3A /* Products */ = { - isa = PBXGroup; - children = ( - 3A6C10AE148122660074811C /* restarter */, - ); - name = Products; - sourceTree = ""; - }; - CF2F99674C3F98D5739C1B45 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - CF2F99674C3F98D5739C1B3E /* restarter */ = { - isa = PBXNativeTarget; - buildConfigurationList = CF2F99674C3F98D5739C1B3F /* Build configuration list for PBXNativeTarget "restarter" */; - buildPhases = ( - CF2F99674C3F98D5739C1B42 /* Sources */, - CF2F99674C3F98D5739C1B43 /* Frameworks */, - CF2F99674C3F98D5739C1B44 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = restarter; - productName = restarter; - productReference = 3A6C10AE148122660074811C /* restarter */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - CF2F99674C3F98D5739C1B37 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = CF2F99674C3F98D5739C1B38 /* Build configuration list for PBXProject "restarter" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = CF2F99674C3F98D5739C1B39; - productRefGroup = CF2F99674C3F98D5739C1B3A /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - CF2F99674C3F98D5739C1B3E /* restarter */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - CF2F99674C3F98D5739C1B42 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3A6C10B4148122790074811C /* restarter.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - CF2F99674C3F98D5739C1B3B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; - ONLY_ACTIVE_ARCH = NO; - SDKROOT = macosx; - }; - name = Release; - }; - CF2F99674C3F98D5739C1B3C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; - ONLY_ACTIVE_ARCH = NO; - SDKROOT = macosx; - }; - name = Debug; - }; - CF2F99674C3F98D5739C1B40 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - CF2F99674C3F98D5739C1B41 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - CF2F99674C3F98D5739C1B38 /* Build configuration list for PBXProject "restarter" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CF2F99674C3F98D5739C1B3B /* Release */, - CF2F99674C3F98D5739C1B3C /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CF2F99674C3F98D5739C1B3F /* Build configuration list for PBXNativeTarget "restarter" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CF2F99674C3F98D5739C1B40 /* Release */, - CF2F99674C3F98D5739C1B41 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = CF2F99674C3F98D5739C1B37 /* Project object */; -}