From: Jonathan Roelofs <jonathan@codesourcery.com>
Date: Fri, 13 Nov 2015 00:25:04 +0000 (+0000)
Subject: [scan-view] Rename 'Resources' --> 'share'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c4ede9462acbcc5242a40c1198a8b96b88b520;p=clang

[scan-view] Rename 'Resources' --> 'share'

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252977 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt
index fb0f26f7e4..7de845a274 100644
--- a/tools/scan-view/CMakeLists.txt
+++ b/tools/scan-view/CMakeLists.txt
@@ -6,7 +6,7 @@ set(BinFiles
       scan-view
       startfile.py)
 
-set(ResourceFiles
+set(ShareFiles
       FileRadar.scpt
       GetRadarVersion.scpt
       bugcatcher.ico)
@@ -24,16 +24,16 @@ if(CLANG_INSTALL_SCANVIEW)
     install(PROGRAMS ${BinFile} DESTINATION bin)
   endforeach()
 
-  foreach(ResourceFile ${ResourceFiles})
-    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile}
+  foreach(ShareFile ${ShareFiles})
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/share/scan-view
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}
                          ${CMAKE_BINARY_DIR}/share/scan-view/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile})
-    list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile})
-    install(FILES Resources/${ResourceFile} DESTINATION share/scan-view)
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})
+    list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})
+    install(FILES Shares/${ShareFile} DESTINATION share/scan-view)
   endforeach()
 
   add_custom_target(scan-view ALL DEPENDS ${Depends})
diff --git a/tools/scan-view/Makefile b/tools/scan-view/Makefile
index c2ca453cc9..2d4380cac3 100644
--- a/tools/scan-view/Makefile
+++ b/tools/scan-view/Makefile
@@ -31,7 +31,7 @@ $(ToolDir)/%: % Makefile $(ToolDir)/.dir
 	$(Verb)cp $< $@
 	$(Verb)chmod +x $@
 
-$(ShareDir)/scan-view/%: Resources/% Makefile $(ShareDir)/scan-view/.dir
+$(ShareDir)/scan-view/%: share/% Makefile $(ShareDir)/scan-view/.dir
 	$(Echo) "Copying $(notdir $<) to the 'share' directory..."
 	$(Verb)cp $< $@
 
diff --git a/tools/scan-view/ScanView.py b/tools/scan-view/ScanView.py
index 2336b090d9..7dc0351ebe 100644
--- a/tools/scan-view/ScanView.py
+++ b/tools/scan-view/ScanView.py
@@ -73,7 +73,7 @@ kReportReplacements.append((re.compile('<!-- REPORTSUMMARYEXTRA -->'),
 ###
 # Other simple parameters
 
-kResources = posixpath.join(posixpath.dirname(__file__), '../share/scan-view')
+kShare = posixpath.join(posixpath.dirname(__file__), '../share/scan-view')
 kConfigPath = os.path.expanduser('~/.scanview.cfg')
 
 ###
@@ -680,7 +680,7 @@ File Bug</h3>
                     overrides['Radar']['Component Version'] = 'X'
                     return self.send_report(None, overrides)
                 elif name=='favicon.ico':
-                    return self.send_path(posixpath.join(kResources,'bugcatcher.ico'))
+                    return self.send_path(posixpath.join(kShare,'bugcatcher.ico'))
         
         # Match directory entries.
         if components[-1] == '':
diff --git a/tools/scan-view/Resources/FileRadar.scpt b/tools/scan-view/share/FileRadar.scpt
similarity index 100%
rename from tools/scan-view/Resources/FileRadar.scpt
rename to tools/scan-view/share/FileRadar.scpt
diff --git a/tools/scan-view/Resources/GetRadarVersion.scpt b/tools/scan-view/share/GetRadarVersion.scpt
similarity index 100%
rename from tools/scan-view/Resources/GetRadarVersion.scpt
rename to tools/scan-view/share/GetRadarVersion.scpt
diff --git a/tools/scan-view/Resources/bugcatcher.ico b/tools/scan-view/share/bugcatcher.ico
similarity index 100%
rename from tools/scan-view/Resources/bugcatcher.ico
rename to tools/scan-view/share/bugcatcher.ico