Enable profiling in scripts provided from entry_points

clcache/__main__.py

@@ -1816,10 +1816,25 @@ def ensureArtifactsExist(cache, cachekey, reason, objectFile, compilerResult, ex
                 extraCallable()
     return returnCode, compilerOutput, compilerStderr, cleanupRequired
 
+class ProfilerError(Exception):
+    def __init__(self, returnCode):
+        self.returnCode = returnCode
 
-if __name__ == '__main__':
+def mainWrapper():
     if 'CLCACHE_PROFILE' in os.environ:
         INVOCATION_HASH = getStringHash(','.join(sys.argv))
-        cProfile.run('main()', filename='clcache-{}.prof'.format(INVOCATION_HASH))
+        CALL_SCRIPT = '''
+import clcache
+returnCode = clcache.__main__.main()
+if returnCode != 0:
+    raise clcache.__main__.ProfilerError(returnCode)
+'''
+        try:
+            cProfile.run(CALL_SCRIPT, filename='clcache-{}.prof'.format(INVOCATION_HASH))
+        except ProfilerError as e:
+            sys.exit(e.returnCode)
     else:
         sys.exit(main())
+
+if __name__ == '__main__':
+    mainWrapper()

pyinstaller/clcache_main.py

@@ -1,2 +1,2 @@
-from clcache.__main__ import main
-main()
+from clcache.__main__ import mainWrapper
+mainWrapper()

setup.py

@@ -22,7 +22,7 @@
     ],
     entry_points={
           'console_scripts': [
-              'clcache = clcache.__main__:main',
+              'clcache = clcache.__main__:mainWrapper',
               'clcache-server = clcache.server.__main__:main',
           ]
     },