Removing app.exe.config file creation. Should no longer be needed with rebuilt...

Removing app.exe.config file creation. Should no longer be needed with rebuilt 3rd party libs. /me crosses fingers.

indra/newview/CMakeLists.txt

@@ -1347,41 +1347,22 @@ if (WINDOWS)
         )
        
     if(WINDOWS)
-      add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS
-          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-          ${CMAKE_CFG_INTDIR}
-          ${CMAKE_CURRENT_SOURCE_DIR}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-          ${VIEWER_BINARY_NAME}.exe.config
-        COMMENT "Creating app.config file"
-        )
-
-      add_custom_target(create_app_config_file ALL 
-        DEPENDS
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config
-          stage_third_party_libs
-	  llcommon
-	  llkdu
-        )
-
       # Copy Win Libs...
       # This happens at build time, not config time. We can't glob files in this cmake.
       # *FIX:Mani Write a sub script to glob the files...
+      # *FIX:Mani Use actually dependencies rather than bulk copy.
       add_custom_command(
-        TARGET create_app_config_file PRE_BUILD
+        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
           -E
           copy_directory
           ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}
-         ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
         COMMENT "Copying staged dlls."
         )
 
-      add_dependencies(${VIEWER_BINARY_NAME} create_app_config_file)
+      add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon llkdu)
     endif(WINDOWS)    
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)

indra/newview/viewer_manifest.py

@@ -314,9 +314,6 @@ def construct(self):
                 self.path("Microsoft.VC80.CRT.manifest")
             self.end_prefix()
 
-        # The config file name needs to match the exe's name.
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
-
         # Vivox runtimes
         if self.prefix(src=self.args['configuration'], dst=""):
             self.path("SLVoice.exe")