Ron/sqltoolsservice update (#163)

* Updating sqltoolsservice with self contained version.

* Refreshing sqltoolsservice again.

* Making mssql-scripter executable and adding null checks in main.py

* Adding clean up step to remove build directory after each build.

* Fixing path for build directory.

Author: MrMeemus

build.py

@@ -29,7 +29,6 @@ def build(platform_names):
 
     # clean
     utility.clean_up(utility.MSSQLSCRIPTER_DIST_DIRECTORY)
-    utility.cleaun_up_egg_info_sub_directories(utility.ROOT_DIR)
 
     print_heading('Running setup')
 
@@ -40,12 +39,15 @@ def build(platform_names):
     utility.exec_command('python dos2unix.py mssql-scripter mssql-scripter', utility.ROOT_DIR)
 
     for platform in platform_names:
+        utility.clean_up(utility.MSSQLSCRIPTER_BUILD_DIRECTORY)
+        utility.cleaun_up_egg_info_sub_directories(utility.ROOT_DIR)
+
         mssqltoolsservice.copy_sqltoolsservice(platform)
 
         print_heading('Building mssql-scripter {} wheel package package'.format(platform))
         utility.exec_command('python --version', utility.ROOT_DIR)
         utility.exec_command(
-            'python setup.py check -r -s bdist_wheel --plat-name {}'.format(platform), 
+            'python setup.py check -r -s bdist_wheel --plat-name {}'.format(platform),
             utility.ROOT_DIR,
             continue_on_error=False)
 

mssql-scripter

@@ -101,19 +101,21 @@ def main(args):
                     sys.stdout.write(line)
 
     finally:
-
-        sql_tools_client.shutdown()
-        tools_service_process.kill()
-        # 1 second time out, allow tools service process to be killed.
-        time.sleep(.1)
-        # Close the stdout file handle or else we would get a resource warning (found via pytest).
-        # This must be closed after the process is killed, otherwise we would block because the process is using
-        # it's stdout.
-        tools_service_process.stdout.close()
-        # None value indicates process has not terminated.
-        if not tools_service_process.poll():
-            sys.stderr.write(
-                u'Sql Tools Service process was not shut down properly.')
+        if sql_tools_client:
+            sql_tools_client.shutdown()
+
+        if tools_service_process:
+            tools_service_process.kill()
+            # 1 second time out, allow tools service process to be killed.
+            time.sleep(.1)
+            # Close the stdout file handle or else we would get a resource warning (found via pytest).
+            # This must be closed after the process is killed, otherwise we would block because the process is using
+            # it's stdout.
+            tools_service_process.stdout.close()
+            # None value indicates process has not terminated.
+            if not tools_service_process.poll():
+                sys.stderr.write(
+                    u'Sql Tools Service process was not shut down properly.')
         try:
             # Remove the temp file if we generated one.
             if temp_file_path:

mssqlscripter/main.py

@@ -37,6 +37,7 @@ def copy_sqltoolsservice(platform):
     utility.clean_up(directory=TARGET_DIRECTORY)
 
     if not platform or platform not in SUPPORTED_PLATFORMS:
+        print('{} is not supported.'.format(platform))
         print('Please provide a valid platform flag.' +
               '[win32, win_amd64, win64, manylinux1_x86_64, manylinux1_i686, macosx_10_11_intel]')
         sys.exit(1)

mssqlscripter/mssqltoolsservice/external.py

@@ -15,6 +15,9 @@
 MSSQLSCRIPTER_DIST_DIRECTORY = os.path.abspath(
     os.path.join(os.path.abspath(__file__), '..', 'dist'))
 
+MSSQLSCRIPTER_BUILD_DIRECTORY = os.path.abspath(
+    os.path.join(os.path.abspath(__file__), '..', 'build'))
+
 
 def exec_command(command, directory, continue_on_error=True):
     """