diff --git a/src/archive.py b/src/archive.py index d18ef64d..2bcb6836 100644 --- a/src/archive.py +++ b/src/archive.py @@ -132,27 +132,16 @@ def createAppArchive(archive_path): # UI files. os.makedirs( os.path.join(temp_path, 'resources', 'report') ) - os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'platform') ) - os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'polymer') ) - os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'web-animations-js') ) - os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'requirejs') ) os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'marked', 'lib') ) os.makedirs( os.path.join(temp_path, 'resources', 'report', 'bower_components', 'Jed') ) - os.makedirs( os.path.join(temp_path, 'resources', 'report', 'css') ) os.makedirs( os.path.join(temp_path, 'resources', 'report', 'js') ) shutil.copy( os.path.join('..', 'resources', 'report', 'index.html'), os.path.join(temp_path, 'resources', 'report') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'platform', 'platform.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'platform') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'polymer', 'polymer.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'polymer') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'web-animations-js', 'web-animations.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'web-animations-js') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'requirejs', 'require.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'requirejs') ) shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'marked', 'lib', 'marked.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'marked', 'lib') ) shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'Jed', 'jed.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'Jed') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'css', 'style.css'), os.path.join(temp_path, 'resources', 'report', 'css') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'css', 'overrides.css'), os.path.join(temp_path, 'resources', 'report', 'css') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'jedGettextParser.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'l10n.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'plugin.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) - shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'script.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) + shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'filters.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) # Docs. shutil.copytree( os.path.join('..', 'docs', 'images'), os.path.join(temp_path, 'docs', 'images') ) diff --git a/src/installer.nsi b/src/installer.nsi index 84c980da..b585914d 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -323,18 +323,12 @@ FunctionEnd ;Install UI files. SetOutPath "$INSTDIR\resources\report" File "..\resources\report\index.html" - File "..\resources\report\bower_components\platform\platform.js" - File "..\resources\report\bower_components\polymer\polymer.js" - File "..\resources\report\bower_components\web-animations-js\web-animations.js" - File "..\resources\report\bower_components\requirejs\require.js" File "..\resources\report\bower_components\marked\lib\marked.js" File "..\resources\report\bower_components\Jed\jed.js" File "..\resources\report\js\jedGettextParser.js" File "..\resources\report\js\l10n.js" File "..\resources\report\js\plugin.js" - File "..\resources\report\js\script.js" - File "..\resources\report\css\style.css" - File "..\resources\report\css\overrides.css" + File "..\resources\report\js\filters.js" ;Install documentation images. SetOutPath "$INSTDIR\docs\images" @@ -481,18 +475,12 @@ FunctionEnd ;Remove resource files. Delete "$INSTDIR\resources\report\index.html" - Delete "$INSTDIR\resources\report\bower_components\platform\platform.js" - Delete "$INSTDIR\resources\report\bower_components\polymer\polymer.js" - Delete "$INSTDIR\resources\report\bower_components\web-animations-js\web-animations.js" - Delete "$INSTDIR\resources\report\bower_components\requirejs\require.js" Delete "$INSTDIR\resources\report\bower_components\marked\lib\marked.js" Delete "$INSTDIR\resources\report\bower_components\Jed\jed.js" Delete "$INSTDIR\resources\report\js\jedGettextParser.js" Delete "$INSTDIR\resources\report\js\l10n.js" Delete "$INSTDIR\resources\report\js\plugin.js" - Delete "$INSTDIR\resources\report\js\script.js" - Delete "$INSTDIR\resources\report\css\style.css" - Delete "$INSTDIR\resources\report\css\overrides.css" + Delete "$INSTDIR\resources\report\js\filters.js" RMDir /r "$INSTDIR\resources\report" ;Remove language files.