Author: jroelofs
Date: Thu Nov 12 18:25:04 2015
New Revision: 252977
URL: http://llvm.org/viewvc/llvm-project?rev=252977&view=rev
Log:
[scan-view] Rename 'Resources' --> 'share'
Added:
cfe/trunk/tools/scan-view/share/
- copied from r252671, cfe/trunk/tools/scan-view/Resources/
Removed:
cfe/trunk/tools/scan-view/Resources/
Modified:
cfe/trunk/tools/scan-view/CMakeLists.txt
cfe/trunk/tools/scan-view/Makefile
cfe/trunk/tools/scan-view/ScanView.py
Modified: cfe/trunk/tools/scan-view/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-view/CMakeLists.txt?rev=252977&r1=252976&r2=252977&view=diff
==============================================================================
--- cfe/trunk/tools/scan-view/CMakeLists.txt (original)
+++ cfe/trunk/tools/scan-view/CMakeLists.txt Thu Nov 12 18:25:04 2015
@@ -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})
Modified: cfe/trunk/tools/scan-view/Makefile
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-view/Makefile?rev=252977&r1=252976&r2=252977&view=diff
==============================================================================
--- cfe/trunk/tools/scan-view/Makefile (original)
+++ cfe/trunk/tools/scan-view/Makefile Thu Nov 12 18:25:04 2015
@@ -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 $< $@
Modified: cfe/trunk/tools/scan-view/ScanView.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-view/ScanView.py?rev=252977&r1=252976&r2=252977&view=diff
==============================================================================
--- cfe/trunk/tools/scan-view/ScanView.py (original)
+++ cfe/trunk/tools/scan-view/ScanView.py Thu Nov 12 18:25:04 2015
@@ -73,7 +73,7 @@ kReportReplacements.append((re.compile('
###
# 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] == '':
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
