summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Roelofs <jonathan@codesourcery.com>2015-11-13 00:25:04 +0000
committerJonathan Roelofs <jonathan@codesourcery.com>2015-11-13 00:25:04 +0000
commit5e205184437a686007396e4254aa16086086210c (patch)
tree2f5de7f54a8c4d773019099ecf66c2c42cdf2f47
parent5b7658c1a4d747351106961c556649feb70a5603 (diff)
downloadbcm5719-llvm-5e205184437a686007396e4254aa16086086210c.tar.gz
bcm5719-llvm-5e205184437a686007396e4254aa16086086210c.zip
[scan-view] Rename 'Resources' --> 'share'
llvm-svn: 252977
-rw-r--r--clang/tools/scan-view/CMakeLists.txt14
-rw-r--r--clang/tools/scan-view/Makefile2
-rw-r--r--clang/tools/scan-view/ScanView.py4
-rw-r--r--clang/tools/scan-view/share/FileRadar.scpt (renamed from clang/tools/scan-view/Resources/FileRadar.scpt)bin18418 -> 18418 bytes
-rw-r--r--clang/tools/scan-view/share/GetRadarVersion.scpt (renamed from clang/tools/scan-view/Resources/GetRadarVersion.scpt)0
-rw-r--r--clang/tools/scan-view/share/bugcatcher.ico (renamed from clang/tools/scan-view/Resources/bugcatcher.ico)bin318 -> 318 bytes
6 files changed, 10 insertions, 10 deletions
diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
index fb0f26f7e44..7de845a2747 100644
--- a/clang/tools/scan-view/CMakeLists.txt
+++ b/clang/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/clang/tools/scan-view/Makefile b/clang/tools/scan-view/Makefile
index c2ca453cc98..2d4380cac3d 100644
--- a/clang/tools/scan-view/Makefile
+++ b/clang/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/clang/tools/scan-view/ScanView.py b/clang/tools/scan-view/ScanView.py
index 2336b090d96..7dc0351ebe7 100644
--- a/clang/tools/scan-view/ScanView.py
+++ b/clang/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/clang/tools/scan-view/Resources/FileRadar.scpt b/clang/tools/scan-view/share/FileRadar.scpt
index 1c7455285cc..1c7455285cc 100644
--- a/clang/tools/scan-view/Resources/FileRadar.scpt
+++ b/clang/tools/scan-view/share/FileRadar.scpt
Binary files differ
diff --git a/clang/tools/scan-view/Resources/GetRadarVersion.scpt b/clang/tools/scan-view/share/GetRadarVersion.scpt
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/tools/scan-view/Resources/GetRadarVersion.scpt
+++ b/clang/tools/scan-view/share/GetRadarVersion.scpt
diff --git a/clang/tools/scan-view/Resources/bugcatcher.ico b/clang/tools/scan-view/share/bugcatcher.ico
index 22d39b59203..22d39b59203 100644
--- a/clang/tools/scan-view/Resources/bugcatcher.ico
+++ b/clang/tools/scan-view/share/bugcatcher.ico
Binary files differ
OpenPOWER on IntegriCloud