Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11323] trunk
|
From: <ai...@us...> - 2010-11-11 11:08:49
|
Revision: 11323
http://plplot.svn.sourceforge.net/plplot/?rev=11323&view=rev
Author: airwin
Date: 2010-11-11 11:08:42 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
Change .rc suffix on driver information files to .driver_info to
avoid a potential name clash on Windows where .rc files have a special
significance. The result was tested with
scripts/comprehensive_test.sh --cmake_added_options -DPLD_pdf=ON \
--build_command 'make -j4' --do_nondynamic no --do_static no \
--do_ctest no --do_test_install_tree yes \
--do_test_traditional_install_tree no --do_test_interactive yes
No issues were found during that comprehensive check.
Modified Paths:
--------------
trunk/cmake/modules/drivers-finish.cmake
trunk/doc/docbook/src/deploying.xml
trunk/drivers/CMakeLists.txt
trunk/drivers/README.drivers
trunk/src/plcore.c
Added Paths:
-----------
trunk/drivers/aqt.driver_info.in
trunk/drivers/cairo.driver_info.in
trunk/drivers/cgm.driver_info.in
trunk/drivers/dg300.driver_info.in
trunk/drivers/gcw.driver_info.in
trunk/drivers/gd.driver_info.in
trunk/drivers/hpgl.driver_info.in
trunk/drivers/impress.driver_info.in
trunk/drivers/linuxvga.driver_info.in
trunk/drivers/ljii.driver_info.in
trunk/drivers/ljiip.driver_info.in
trunk/drivers/mem.driver_info.in
trunk/drivers/ntk.driver_info.in
trunk/drivers/null.driver_info.in
trunk/drivers/pbm.driver_info.in
trunk/drivers/pdf.driver_info.in
trunk/drivers/plmeta.driver_info.in
trunk/drivers/ps.driver_info.in
trunk/drivers/pstex.driver_info.in
trunk/drivers/psttf.driver_info.in
trunk/drivers/qt.driver_info.in
trunk/drivers/svg.driver_info.in
trunk/drivers/tek.driver_info.in
trunk/drivers/tk.driver_info.in
trunk/drivers/tkwin.driver_info.in
trunk/drivers/wingcc.driver_info.in
trunk/drivers/wxwidgets.driver_info.in
trunk/drivers/xfig.driver_info.in
trunk/drivers/xwin.driver_info.in
Removed Paths:
-------------
trunk/drivers/aqt.rc.in
trunk/drivers/cairo.rc.in
trunk/drivers/cgm.rc.in
trunk/drivers/dg300.rc.in
trunk/drivers/gcw.rc.in
trunk/drivers/gd.rc.in
trunk/drivers/hpgl.rc.in
trunk/drivers/impress.rc.in
trunk/drivers/linuxvga.rc.in
trunk/drivers/ljii.rc.in
trunk/drivers/ljiip.rc.in
trunk/drivers/mem.rc.in
trunk/drivers/ntk.rc.in
trunk/drivers/null.rc.in
trunk/drivers/pbm.rc.in
trunk/drivers/pdf.rc.in
trunk/drivers/plmeta.rc.in
trunk/drivers/ps.rc.in
trunk/drivers/pstex.rc.in
trunk/drivers/psttf.rc.in
trunk/drivers/qt.rc.in
trunk/drivers/svg.rc.in
trunk/drivers/tek.rc.in
trunk/drivers/tk.rc.in
trunk/drivers/tkwin.rc.in
trunk/drivers/wingcc.rc.in
trunk/drivers/wxwidgets.rc.in
trunk/drivers/xfig.rc.in
trunk/drivers/xwin.rc.in
Modified: trunk/cmake/modules/drivers-finish.cmake
===================================================================
--- trunk/cmake/modules/drivers-finish.cmake 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/cmake/modules/drivers-finish.cmake 2010-11-11 11:08:42 UTC (rev 11323)
@@ -69,12 +69,12 @@
if(APPEND_DRIVER)
if(ENABLE_DYNDRIVERS)
set(${DRIVER}_INFO)
- if(EXISTS ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.rc.in)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.driver_info.in)
file(STRINGS
- ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.rc.in
+ ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.driver_info.in
${DRIVER}_INFO
)
- endif(EXISTS ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.rc.in)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.driver_info.in)
endif(ENABLE_DYNDRIVERS)
list(APPEND DRIVERS_LIST ${DRIVER})
@@ -118,7 +118,7 @@
endforeach(DRIVERS_DEVICE)
# Calculate driver information and store it in
-# ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.rc for each driver to be compared
+# ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.driver_info for each driver to be compared
# at run-time with the same information obtained from the actual
# driver plug-in by test-drv-info as a check of the validity of
# that plug-in (and consistency of the driver code with DRIVERS_DEVICE_LIST
@@ -142,7 +142,7 @@
if(DEVICE_INFO_MATCHED)
list(REMOVE_ITEM ${DRIVER}_INFO ${DEVICE_INFO_MATCHED})
else(DEVICE_INFO_MATCHED)
- message(FATAL_ERROR "${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.rc.in not consistent with ${CMAKE_SOURCE_DIR}/cmake/modules/drivers-init.cmake")
+ message(FATAL_ERROR "${CMAKE_SOURCE_DIR}/drivers/${DRIVER}.driver_info.in not consistent with ${CMAKE_SOURCE_DIR}/cmake/modules/drivers-init.cmake")
endif(DEVICE_INFO_MATCHED)
endif(NOT PLD_${DEVICE})
endif(${DRIVER}_INFO)
@@ -151,9 +151,9 @@
foreach(DRIVERS_DEVICE ${DRIVERS_DEVICE_LIST})
string(REGEX REPLACE "^.*:(.*):.*:.*:.*$" "\\1" DRIVER ${DRIVERS_DEVICE})
if(${DRIVER}_INFO)
- file(WRITE ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.rc "")
+ file(WRITE ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.driver_info "")
foreach(DEVICE_INFO ${${DRIVER}_INFO})
- file(APPEND ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.rc "${DEVICE_INFO}\n")
+ file(APPEND ${CMAKE_BINARY_DIR}/drivers/${DRIVER}.driver_info "${DEVICE_INFO}\n")
endforeach(DEVICE_INFO ${${DRIVER}_INFO})
endif(${DRIVER}_INFO)
endforeach(DRIVERS_DEVICE ${DRIVERS_DEVICE_LIST})
Modified: trunk/doc/docbook/src/deploying.xml
===================================================================
--- trunk/doc/docbook/src/deploying.xml 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/doc/docbook/src/deploying.xml 2010-11-11 11:08:42 UTC (rev 11323)
@@ -287,7 +287,7 @@
<para>
When PLplot uses dynamic devices, it first builds up a list of them, by
examining a directory which contains files describing those devices:
- the <filename>*.rc</filename> files. Each of these files indicates what
+ the <filename>*.driver_info</filename> files. Each of these files indicates what
the relevant properties for the device or devices. Then when the
device is actually needed, the corresponding shared object (or plug-in
or DLL depending on your terminology) is dynamically loaded.
Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/CMakeLists.txt 2010-11-11 11:08:42 UTC (rev 11323)
@@ -186,24 +186,24 @@
)
add_custom_command(
OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
COMMAND test-drv-info
${SOURCE_ROOT_NAME}
- > ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc
+ > ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
COMMAND ${CMAKE_COMMAND} -E compare_files
- ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.driver_info
DEPENDS
${${SOURCE_ROOT_NAME}_LOCATION}
${test-drv-info_LOCATION}
)
add_custom_target(test_${SOURCE_ROOT_NAME}_dyndriver
DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
)
set_property(GLOBAL
PROPERTY FILE_DEPENDS_${SOURCE_ROOT_NAME}_dyndriver
- ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
)
add_dependencies(test_${SOURCE_ROOT_NAME}_dyndriver
test-drv-info
@@ -217,7 +217,7 @@
DESTINATION ${DRV_DIR}
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.driver_info
DESTINATION ${DRV_DIR}
)
endforeach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
Modified: trunk/drivers/README.drivers
===================================================================
--- trunk/drivers/README.drivers 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/README.drivers 2010-11-11 11:08:42 UTC (rev 11323)
@@ -13,7 +13,7 @@
The following PLplot source-tree files are affected:
-plplot/drivers/<driver>.rc.in
+plplot/drivers/<driver>.driver_info.in
plplot/cmake/modules/drivers-init.cmake
plplot/include/drivers.h
plplot/include/plDevs.h.cmake
@@ -21,7 +21,7 @@
plplot/plplot-test/plplot-test.sh.cmake
plplot/examples/plplot_configure.cmake_installed_examples.in
-1. Add a line to plplot/drivers/<driver>.rc.in consisting of the following
+1. Add a line to plplot/drivers/<driver>.driver_info.in consisting of the following
colon-separated fields:
<device>:<description string>:<interactive?>:<driver>:<device number>:<device>
Copied: trunk/drivers/aqt.driver_info.in (from rev 11321, trunk/drivers/aqt.rc.in)
===================================================================
--- trunk/drivers/aqt.driver_info.in (rev 0)
+++ trunk/drivers/aqt.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+aqt:AquaTerm (Mac OS X):1:aqt:50:aqt
Deleted: trunk/drivers/aqt.rc.in
===================================================================
--- trunk/drivers/aqt.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/aqt.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-aqt:AquaTerm (Mac OS X):1:aqt:50:aqt
Copied: trunk/drivers/cairo.driver_info.in (from rev 11321, trunk/drivers/cairo.rc.in)
===================================================================
--- trunk/drivers/cairo.driver_info.in (rev 0)
+++ trunk/drivers/cairo.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,8 @@
+xcairo:Cairo X Windows Driver:1:cairo:100:xcairo
+pdfcairo:Cairo PDF Driver:0:cairo:101:pdfcairo
+pscairo:Cairo PS Driver:0:cairo:102:pscairo
+svgcairo:Cairo SVG Driver:0:cairo:103:svgcairo
+pngcairo:Cairo PNG Driver:0:cairo:104:pngcairo
+memcairo:Cairo Memory Driver:0:cairo:105:memcairo
+extcairo:Cairo External Context Driver:0:cairo:106:extcairo
+wincairo:Cairo Microscoft Windows Driver:0:cairo:107:wincairo
\ No newline at end of file
Deleted: trunk/drivers/cairo.rc.in
===================================================================
--- trunk/drivers/cairo.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/cairo.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,8 +0,0 @@
-xcairo:Cairo X Windows Driver:1:cairo:100:xcairo
-pdfcairo:Cairo PDF Driver:0:cairo:101:pdfcairo
-pscairo:Cairo PS Driver:0:cairo:102:pscairo
-svgcairo:Cairo SVG Driver:0:cairo:103:svgcairo
-pngcairo:Cairo PNG Driver:0:cairo:104:pngcairo
-memcairo:Cairo Memory Driver:0:cairo:105:memcairo
-extcairo:Cairo External Context Driver:0:cairo:106:extcairo
-wincairo:Cairo Microscoft Windows Driver:0:cairo:107:wincairo
\ No newline at end of file
Copied: trunk/drivers/cgm.driver_info.in (from rev 11321, trunk/drivers/cgm.rc.in)
===================================================================
--- trunk/drivers/cgm.driver_info.in (rev 0)
+++ trunk/drivers/cgm.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+cgm:CGM file:0:cgm:44:cgm
Deleted: trunk/drivers/cgm.rc.in
===================================================================
--- trunk/drivers/cgm.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/cgm.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-cgm:CGM file:0:cgm:44:cgm
Copied: trunk/drivers/dg300.driver_info.in (from rev 11321, trunk/drivers/dg300.rc.in)
===================================================================
--- trunk/drivers/dg300.driver_info.in (rev 0)
+++ trunk/drivers/dg300.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+dg300:DG300 Terminal:0:dg300:25:dg300
Deleted: trunk/drivers/dg300.rc.in
===================================================================
--- trunk/drivers/dg300.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/dg300.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-dg300:DG300 Terminal:0:dg300:25:dg300
Copied: trunk/drivers/gcw.driver_info.in (from rev 11321, trunk/drivers/gcw.rc.in)
===================================================================
--- trunk/drivers/gcw.driver_info.in (rev 0)
+++ trunk/drivers/gcw.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+gcw:Gnome Canvas Widget:1:gcw:10:gcw
Deleted: trunk/drivers/gcw.rc.in
===================================================================
--- trunk/drivers/gcw.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/gcw.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-gcw:Gnome Canvas Widget:1:gcw:10:gcw
Copied: trunk/drivers/gd.driver_info.in (from rev 11321, trunk/drivers/gd.rc.in)
===================================================================
--- trunk/drivers/gd.driver_info.in (rev 0)
+++ trunk/drivers/gd.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,3 @@
+png:PNG file:0:gd:39:png
+jpeg:JPEG file:0:gd:40:jpeg
+gif:GIF file:0:gd:47:gif
Deleted: trunk/drivers/gd.rc.in
===================================================================
--- trunk/drivers/gd.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/gd.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,3 +0,0 @@
-png:PNG file:0:gd:39:png
-jpeg:JPEG file:0:gd:40:jpeg
-gif:GIF file:0:gd:47:gif
Copied: trunk/drivers/hpgl.driver_info.in (from rev 11321, trunk/drivers/hpgl.rc.in)
===================================================================
--- trunk/drivers/hpgl.driver_info.in (rev 0)
+++ trunk/drivers/hpgl.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,3 @@
+hp7470:HP 7470 Plotter File (HPGL Cartridge, Small Plotter):0:hpgl:34:hp7470
+hp7580:HP 7580 Plotter File (Large Plotter):0:hpgl:35:hp7580
+lj_hpgl:HP Laserjet III, HPGL emulation mode:0:hpgl:36:lj_hpgl
Deleted: trunk/drivers/hpgl.rc.in
===================================================================
--- trunk/drivers/hpgl.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/hpgl.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,3 +0,0 @@
-hp7470:HP 7470 Plotter File (HPGL Cartridge, Small Plotter):0:hpgl:34:hp7470
-hp7580:HP 7580 Plotter File (Large Plotter):0:hpgl:35:hp7580
-lj_hpgl:HP Laserjet III, HPGL emulation mode:0:hpgl:36:lj_hpgl
Copied: trunk/drivers/impress.driver_info.in (from rev 11321, trunk/drivers/impress.rc.in)
===================================================================
--- trunk/drivers/impress.driver_info.in (rev 0)
+++ trunk/drivers/impress.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+imp:Impress File:0:impress:37:imp
Deleted: trunk/drivers/impress.rc.in
===================================================================
--- trunk/drivers/impress.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/impress.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-imp:Impress File:0:impress:37:imp
Copied: trunk/drivers/linuxvga.driver_info.in (from rev 11321, trunk/drivers/linuxvga.rc.in)
===================================================================
--- trunk/drivers/linuxvga.driver_info.in (rev 0)
+++ trunk/drivers/linuxvga.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+linuxvga:Linux VGA driver:0:linuxvga:8:vga
Deleted: trunk/drivers/linuxvga.rc.in
===================================================================
--- trunk/drivers/linuxvga.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/linuxvga.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-linuxvga:Linux VGA driver:0:linuxvga:8:vga
Copied: trunk/drivers/ljii.driver_info.in (from rev 11321, trunk/drivers/ljii.rc.in)
===================================================================
--- trunk/drivers/ljii.driver_info.in (rev 0)
+++ trunk/drivers/ljii.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+ljii:LaserJet II Bitmap File (150 dpi):0:ljii:33:ljii
Deleted: trunk/drivers/ljii.rc.in
===================================================================
--- trunk/drivers/ljii.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/ljii.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-ljii:LaserJet II Bitmap File (150 dpi):0:ljii:33:ljii
Copied: trunk/drivers/ljiip.driver_info.in (from rev 11321, trunk/drivers/ljiip.rc.in)
===================================================================
--- trunk/drivers/ljiip.driver_info.in (rev 0)
+++ trunk/drivers/ljiip.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+ljiip:LaserJet IIp/deskjet compressed graphics:0:ljiip:32:ljiip
Deleted: trunk/drivers/ljiip.rc.in
===================================================================
--- trunk/drivers/ljiip.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/ljiip.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-ljiip:LaserJet IIp/deskjet compressed graphics:0:ljiip:32:ljiip
Copied: trunk/drivers/mem.driver_info.in (from rev 11321, trunk/drivers/mem.rc.in)
===================================================================
--- trunk/drivers/mem.driver_info.in (rev 0)
+++ trunk/drivers/mem.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+mem:User-supplied memory device:-1:mem:46:mem
Deleted: trunk/drivers/mem.rc.in
===================================================================
--- trunk/drivers/mem.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/mem.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-mem:User-supplied memory device:-1:mem:46:mem
Copied: trunk/drivers/ntk.driver_info.in (from rev 11321, trunk/drivers/ntk.rc.in)
===================================================================
--- trunk/drivers/ntk.driver_info.in (rev 0)
+++ trunk/drivers/ntk.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+ntk:New tk driver:1:ntk:43:ntk
Deleted: trunk/drivers/ntk.rc.in
===================================================================
--- trunk/drivers/ntk.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/ntk.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-ntk:New tk driver:1:ntk:43:ntk
Copied: trunk/drivers/null.driver_info.in (from rev 11321, trunk/drivers/null.rc.in)
===================================================================
--- trunk/drivers/null.driver_info.in (rev 0)
+++ trunk/drivers/null.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+null:Null device:-1:null:42:null
Deleted: trunk/drivers/null.rc.in
===================================================================
--- trunk/drivers/null.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/null.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-null:Null device:-1:null:42:null
Copied: trunk/drivers/pbm.driver_info.in (from rev 11321, trunk/drivers/pbm.rc.in)
===================================================================
--- trunk/drivers/pbm.driver_info.in (rev 0)
+++ trunk/drivers/pbm.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+pbm:PDB (PPM) Driver:0:pbm:38:pbm
Deleted: trunk/drivers/pbm.rc.in
===================================================================
--- trunk/drivers/pbm.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/pbm.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-pbm:PDB (PPM) Driver:0:pbm:38:pbm
Copied: trunk/drivers/pdf.driver_info.in (from rev 11321, trunk/drivers/pdf.rc.in)
===================================================================
--- trunk/drivers/pdf.driver_info.in (rev 0)
+++ trunk/drivers/pdf.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+pdf:Portable Document Format PDF:1:pdf:58:pdf
Deleted: trunk/drivers/pdf.rc.in
===================================================================
--- trunk/drivers/pdf.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/pdf.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-pdf:Portable Document Format PDF:1:pdf:58:pdf
Copied: trunk/drivers/plmeta.driver_info.in (from rev 11321, trunk/drivers/plmeta.rc.in)
===================================================================
--- trunk/drivers/plmeta.driver_info.in (rev 0)
+++ trunk/drivers/plmeta.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+plmeta:PLplot Native Meta-File:0:plmeta:26:plm
Deleted: trunk/drivers/plmeta.rc.in
===================================================================
--- trunk/drivers/plmeta.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/plmeta.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-plmeta:PLplot Native Meta-File:0:plmeta:26:plm
Copied: trunk/drivers/ps.driver_info.in (from rev 11321, trunk/drivers/ps.rc.in)
===================================================================
--- trunk/drivers/ps.driver_info.in (rev 0)
+++ trunk/drivers/ps.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,2 @@
+ps:PostScript File (monochrome):0:ps:29:psm
+psc:PostScript File (color):0:ps:30:psc
Deleted: trunk/drivers/ps.rc.in
===================================================================
--- trunk/drivers/ps.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/ps.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,2 +0,0 @@
-ps:PostScript File (monochrome):0:ps:29:psm
-psc:PostScript File (color):0:ps:30:psc
Copied: trunk/drivers/pstex.driver_info.in (from rev 11321, trunk/drivers/pstex.rc.in)
===================================================================
--- trunk/drivers/pstex.driver_info.in (rev 0)
+++ trunk/drivers/pstex.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+pstex:Combined Postscript/LaTeX files:0:pstex:41:pstex
Deleted: trunk/drivers/pstex.rc.in
===================================================================
--- trunk/drivers/pstex.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/pstex.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-pstex:Combined Postscript/LaTeX files:0:pstex:41:pstex
Copied: trunk/drivers/psttf.driver_info.in (from rev 11321, trunk/drivers/psttf.rc.in)
===================================================================
--- trunk/drivers/psttf.driver_info.in (rev 0)
+++ trunk/drivers/psttf.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,2 @@
+psttf:PostScript File (monochrome):0:psttf:55:psttfm
+psttfc:PostScript File (color):0:psttf:56:psttfc
Deleted: trunk/drivers/psttf.rc.in
===================================================================
--- trunk/drivers/psttf.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/psttf.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,2 +0,0 @@
-psttf:PostScript File (monochrome):0:psttf:55:psttfm
-psttfc:PostScript File (color):0:psttf:56:psttfc
Copied: trunk/drivers/qt.driver_info.in (from rev 11321, trunk/drivers/qt.rc.in)
===================================================================
--- trunk/drivers/qt.driver_info.in (rev 0)
+++ trunk/drivers/qt.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,11 @@
+bmpqt:Qt Windows bitmap driver:0:qt:66:bmpqt
+jpgqt:Qt jpg driver:0:qt:67:jpgqt
+pngqt:Qt png driver:0:qt:68:pngqt
+ppmqt:Qt ppm driver:0:qt:69:ppmqt
+tiffqt:Qt tiff driver:0:qt:70:tiffqt
+svgqt:Qt SVG driver:0:qt:71:svgqt
+qtwidget:Qt Widget:1:qt:72:qtwidget
+epsqt:Qt EPS driver:0:qt:73:epsqt
+pdfqt:Qt PDF driver:0:qt:74:pdfqt
+extqt:External Qt driver:0:qt:75:extqt
+memqt:Memory Qt driver:0:qt:76:memqt
Deleted: trunk/drivers/qt.rc.in
===================================================================
--- trunk/drivers/qt.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/qt.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,11 +0,0 @@
-bmpqt:Qt Windows bitmap driver:0:qt:66:bmpqt
-jpgqt:Qt jpg driver:0:qt:67:jpgqt
-pngqt:Qt png driver:0:qt:68:pngqt
-ppmqt:Qt ppm driver:0:qt:69:ppmqt
-tiffqt:Qt tiff driver:0:qt:70:tiffqt
-svgqt:Qt SVG driver:0:qt:71:svgqt
-qtwidget:Qt Widget:1:qt:72:qtwidget
-epsqt:Qt EPS driver:0:qt:73:epsqt
-pdfqt:Qt PDF driver:0:qt:74:pdfqt
-extqt:External Qt driver:0:qt:75:extqt
-memqt:Memory Qt driver:0:qt:76:memqt
Copied: trunk/drivers/svg.driver_info.in (from rev 11321, trunk/drivers/svg.rc.in)
===================================================================
--- trunk/drivers/svg.driver_info.in (rev 0)
+++ trunk/drivers/svg.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+svg:Scalable Vector Graphics (SVG 1.1):1:svg:57:svg
Deleted: trunk/drivers/svg.rc.in
===================================================================
--- trunk/drivers/svg.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/svg.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-svg:Scalable Vector Graphics (SVG 1.1):1:svg:57:svg
Copied: trunk/drivers/tek.driver_info.in (from rev 11321, trunk/drivers/tek.rc.in)
===================================================================
--- trunk/drivers/tek.driver_info.in (rev 0)
+++ trunk/drivers/tek.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,6 @@
+conex:Conex vt320/tek emulator:1:tek:24:conex
+mskermit:MS-Kermit emulator:1:tek:21:mskermit
+tek4107f:Tektronix File (4105/4107):0:tek:28:tek4107f
+versaterm:Versaterm vt100/tek emulator:1:tek:22:versaterm
+vlt:VLT vt100/tek emulator:1:tek:23:vlt
+xterm:Xterm Window:1:tek:18:xterm
Deleted: trunk/drivers/tek.rc.in
===================================================================
--- trunk/drivers/tek.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/tek.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,6 +0,0 @@
-conex:Conex vt320/tek emulator:1:tek:24:conex
-mskermit:MS-Kermit emulator:1:tek:21:mskermit
-tek4107f:Tektronix File (4105/4107):0:tek:28:tek4107f
-versaterm:Versaterm vt100/tek emulator:1:tek:22:versaterm
-vlt:VLT vt100/tek emulator:1:tek:23:vlt
-xterm:Xterm Window:1:tek:18:xterm
Copied: trunk/drivers/tk.driver_info.in (from rev 11321, trunk/drivers/tk.rc.in)
===================================================================
--- trunk/drivers/tk.driver_info.in (rev 0)
+++ trunk/drivers/tk.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+tk:Tcl/TK Window:1:tk:7:tk
Deleted: trunk/drivers/tk.rc.in
===================================================================
--- trunk/drivers/tk.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/tk.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-tk:Tcl/TK Window:1:tk:7:tk
Copied: trunk/drivers/tkwin.driver_info.in (from rev 11321, trunk/drivers/tkwin.rc.in)
===================================================================
--- trunk/drivers/tkwin.driver_info.in (rev 0)
+++ trunk/drivers/tkwin.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+tkwin:New tk driver:1:tkwin:45:tkwin
Deleted: trunk/drivers/tkwin.rc.in
===================================================================
--- trunk/drivers/tkwin.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/tkwin.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-tkwin:New tk driver:1:tkwin:45:tkwin
Copied: trunk/drivers/wingcc.driver_info.in (from rev 11321, trunk/drivers/wingcc.rc.in)
===================================================================
--- trunk/drivers/wingcc.driver_info.in (rev 0)
+++ trunk/drivers/wingcc.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+wingcc:Win32 (GCC):1:wingcc:9:wingcc
Deleted: trunk/drivers/wingcc.rc.in
===================================================================
--- trunk/drivers/wingcc.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/wingcc.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-wingcc:Win32 (GCC):1:wingcc:9:wingcc
Copied: trunk/drivers/wxwidgets.driver_info.in (from rev 11321, trunk/drivers/wxwidgets.rc.in)
===================================================================
--- trunk/drivers/wxwidgets.driver_info.in (rev 0)
+++ trunk/drivers/wxwidgets.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1,2 @@
+wxwidgets:wxWidgets Driver:1:wxwidgets:51:wxwidgets
+wxpng:wxWidgets PNG Driver:0:wxwidgets:52:wxpng
Deleted: trunk/drivers/wxwidgets.rc.in
===================================================================
--- trunk/drivers/wxwidgets.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/wxwidgets.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1,2 +0,0 @@
-wxwidgets:wxWidgets Driver:1:wxwidgets:51:wxwidgets
-wxpng:wxWidgets PNG Driver:0:wxwidgets:52:wxpng
Copied: trunk/drivers/xfig.driver_info.in (from rev 11321, trunk/drivers/xfig.rc.in)
===================================================================
--- trunk/drivers/xfig.driver_info.in (rev 0)
+++ trunk/drivers/xfig.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+xfig:Fig file:0:xfig:31:xfig
Deleted: trunk/drivers/xfig.rc.in
===================================================================
--- trunk/drivers/xfig.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/xfig.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-xfig:Fig file:0:xfig:31:xfig
Copied: trunk/drivers/xwin.driver_info.in (from rev 11321, trunk/drivers/xwin.rc.in)
===================================================================
--- trunk/drivers/xwin.driver_info.in (rev 0)
+++ trunk/drivers/xwin.driver_info.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -0,0 +1 @@
+xwin:X-Window (Xlib):1:xwin:5:xw
Deleted: trunk/drivers/xwin.rc.in
===================================================================
--- trunk/drivers/xwin.rc.in 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/drivers/xwin.rc.in 2010-11-11 11:08:42 UTC (rev 11323)
@@ -1 +0,0 @@
-xwin:X-Window (Xlib):1:xwin:5:xw
Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c 2010-11-11 10:34:19 UTC (rev 11322)
+++ trunk/src/plcore.c 2010-11-11 11:08:42 UTC (rev 11323)
@@ -2897,13 +2897,14 @@
while ( ( entry = readdir( dp_drvdir ) ) != NULL )
{
char* name = entry->d_name;
- int len = strlen( name ) - 3;
+ // Suffix .driver_info has a length of 12 letters.
+ int len = strlen( name ) - 12;
pldebug( "plInitDispatchTable",
"Consider file %s\n", name );
-// Only consider entries that have the ".rc" suffix
- if ( ( len > 0 ) && ( strcmp( name + len, ".rc" ) == 0 ) )
+// Only consider entries that have the ".driver_info" suffix
+ if ( ( len > 0 ) && ( strcmp( name + len, ".driver_info" ) == 0 ) )
{
char path[PLPLOT_MAX_PATH];
FILE * fd;
@@ -2922,7 +2923,7 @@
return;
}
-// Each line in the <driver>.rc file corresponds to a specific device.
+// Each line in the <driver>.driver_info file corresponds to a specific device.
// Write it to the drivers db file and take care of leading newline
// character
@@ -3072,11 +3073,11 @@
#endif
- if ( npldrivers == 0 )
- {
- npldynamicdevices = 0;
- plexit( "No device drivers found - please check the environment variable PLPLOT_DRV_DIR" );
- }
+ if ( npldrivers == 0 )
+ {
+ npldynamicdevices = 0;
+ plexit( "No device drivers found - please check the environment variable PLPLOT_DRV_DIR" );
+ }
// Finally, we need to sort the list into presentation order, based on the
// sequence number in the dispatch ttable entries.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|