- Timestamp:
- Dec 12, 2014, 7:16:36 AM (10 years ago)
- Location:
- branches/r9
- Files:
-
- 18 added
- 8 deleted
- 21 edited
- 9 copied
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/Makefile.in
r4840 r4852 15 15 WORDSIZE = @WORDSIZE@ 16 16 version = $(RAPPTURE_MAJOR_VERSION).$(RAPPTURE_MINOR_VERSION).$(RAPPTURE_RELEASE_SERIAL) 17 runtime = $(shell cd ../r untime; pwd)18 TAG = trunk17 runtime = $(shell cd ../rappture/runtime; pwd) 18 TAG = branches/blt4 19 19 20 20 # ------------------------------------------------------------------------ … … 64 64 65 65 targets = \ 66 blt builder cmake examples expat expect glew gui geovis \ 67 htmlwidget itcl itk lang librappture nanovis nanoscale \ 68 optimizer osg osgearth pymol \ 69 pymolproxy shape sqlitetcl tcl tcllib tdom tester tk \ 70 tkimg tls video voronoi vtk vtkvis zlib 66 blt builder cmake examples expat expect gui htmlwidget itcl \ 67 itk lang librappture optimizer shape sqlitetcl tcl tcllib \ 68 tdom tester tk tkimg tls video vtk zlib packages 71 69 72 70 .PHONY: $(targets) … … 74 72 .NOTPARALLEL: 75 73 76 all: gui 77 78 fullpkg: tester builder renderservers 79 80 renderservers: nanoscale nanovis vtkvis geovis pymolproxy 74 all: gui packages lang 75 76 fullpkg: tester builder packages 81 77 82 78 libshell: $(tcllib)/timestamp $(tls)/timestamp $(itcl)/timestamp … … 84 80 # Aliases for package directory names. 85 81 86 blt = blt2.4z 87 builder = builder 88 cmake = cmake-2.8.12 89 examples =examples 90 expat = expat-2.0.1 82 blt = blt4 83 cmake = cmake-2.8.12.2 84 examples = examples 85 expat = expat-2.1.0 91 86 expect = expect5.45 92 glew = glew 87 freetype = freetype-2.5.3 93 88 gui = gui 94 89 htmlwidget = htmlwidget-3a14 95 itcl = itcl3. 390 itcl = itcl3.4 96 91 itk = itk3.3 92 jpeg = jpeg-8d 93 libpng = libpng-1.6.15 94 librappture = librappture 95 openssl = openssl-1.0.1j 96 optimizer = optimizer 97 shape = shape0.4 98 sqlitetcl = sqlite-src-3080703 99 sqlitetcl = sqlite-3071502 100 tcl = tcl8.5.10 101 tcllib = tcllib-1.15 102 tdom = tDOM-0.8.3 103 tiff = tiff-4.0.3 104 tk = tk8.5.10 105 tkimg = tkimg1.4 106 tls = tls1.6 107 vtk = vtk-6.0.0 108 zlib = zlib 109 tester = tester 110 builder = builder 97 111 lang = lang 98 librappture = librappture99 nanoscale = nanoscale100 nanovis = nanovis101 optimizer = optimizer102 osg = OpenSceneGraph-3.2.0103 osgearth = osgearth-2.5104 pymol = pymol105 pymolproxy = pymolproxy106 shape = shape0.4107 sqlitetcl = sqlite-3071502/tea108 tcl = tcl8.4.19109 tcllib = tcllib-1.12110 tdom = tDOM-0.8.2111 tester = tester112 tk = tk8.4.19113 tkimg = tkimg1.3114 tls = tls1.6115 video = video116 voronoi = voronoi117 vtk = vtk-6.0.0118 vtkvis = vtkvis119 geovis = geovis120 zlib = zlib121 112 122 113 subdirs = \ 123 $(blt) $(builder) $(cmake) $(examples) $(expat) $(expect) $(glew)\124 $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(librappture) $(nanovis)\125 $(optimizer) $( osg) $(osgearth) $(pymol) $(pymolproxy) $(shape) \114 $(blt) $(builder) $(cmake) $(examples) $(expat) $(expect) \ 115 $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(librappture) \ 116 $(optimizer) $(shape) \ 126 117 $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tester) $(tk) $(tkimg) \ 127 $(tls) $(v ideo) $(voronoi) $(vtk) $(vtkvis) $(zlib) $(geovis)118 $(tls) $(vtk) $(zlib) 128 119 129 120 … … 474 465 + $(install_expect) 475 466 + $(touch_expect) 476 477 # -------------------------------------------------------------------------478 # GLEW479 # -------------------------------------------------------------------------480 481 glew_flags = \482 --enable-shared \483 $(common_flags)484 485 glew: $(glew)/timestamp486 487 clean-glew:488 $(clean_glew)489 fetch-glew:490 $(fetch_glew)491 configure-glew:492 $(configure_glew)493 build-glew:494 $(build_glew)495 install-glew:496 $(install_glew)497 touch-glew:498 $(touch_glew)499 force-glew:500 + $(clean_glew)501 + $(fetch_glew)502 + $(configure_glew)503 + $(build_glew)504 + $(install_glew)505 + $(touch_glew)506 507 define clean_glew508 $(RM) -r $(glew)509 endef510 define fetch_glew511 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(glew)512 endef513 define configure_glew514 $(MKDIR_P) $(glew)515 cd $(glew); $(runtime)/$(glew)/configure $(glew_flags)516 endef517 define build_glew518 $(MAKE) -C $(glew) all519 endef520 define install_glew521 $(MAKE) -C $(glew) install522 endef523 define touch_glew524 touch $(glew)/timestamp525 endef526 527 $(glew)/timestamp:528 + $(clean_glew)529 + $(fetch_glew)530 + $(configure_glew)531 + $(build_glew)532 + $(install_glew)533 + $(touch_glew)534 467 535 468 # ------------------------------------------------------------------------- … … 695 628 endef 696 629 define fetch_itcl 697 sh $(srcdir)/fetch.sh $(TAG) $( srcdir) $(itcl)630 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(itcl) 698 631 endef 699 632 define configure_itcl … … 893 826 894 827 # ------------------------------------------------------------------------- 895 # NANOSCALE896 # -------------------------------------------------------------------------897 898 nanoscale_flags = \899 --with-statsdir=$(statsdir) \900 $(common_flags)901 902 nanoscale: $(nanoscale)/timestamp903 904 clean-nanoscale:905 $(clean_nanoscale)906 fetch-nanoscale:907 $(fetch_nanoscale)908 configure-nanoscale:909 $(configure_nanoscale)910 build-nanoscale:911 $(build_nanoscale)912 install-nanoscale:913 $(install_nanoscale)914 touch-nanoscale:915 $(touch_nanoscale)916 force-nanoscale: $(pymol)/timestamp917 + $(clean_nanoscale)918 + $(fetch_nanoscale)919 + $(configure_nanoscale)920 + $(build_nanoscale)921 + $(install_nanoscale)922 + $(touch_nanoscale)923 924 define clean_nanoscale925 $(RM) -r $(nanoscale)926 endef927 define fetch_nanoscale928 endef929 define configure_nanoscale930 $(MKDIR_P) $(nanoscale)931 cd $(nanoscale); $(srcdir)/packages/vizservers/$(nanoscale)/configure $(nanoscale_flags)932 endef933 define build_nanoscale934 $(MAKE) -C $(nanoscale) all935 endef936 define install_nanoscale937 $(MAKE) -C $(nanoscale) install938 endef939 define touch_nanoscale940 touch $(nanoscale)/timestamp941 endef942 943 $(nanoscale)/timestamp: $(pymol)/timestamp944 + $(clean_nanoscale)945 + $(fetch_nanoscale)946 + $(configure_nanoscale)947 + $(build_nanoscale)948 + $(install_nanoscale)949 + $(touch_nanoscale)950 951 952 # -------------------------------------------------------------------------953 # NANOVIS954 # -------------------------------------------------------------------------955 956 nanovis_flags = \957 --with-tcllib=$(libdir) \958 --with-rappture=$(exec_prefix) \959 --with-vtk="6.0" \960 --with-vtk-includes=$(incdir) \961 --with-vtk-libs=$(libdir) \962 --with-statsdir=$(statsdir) \963 $(common_flags)964 965 nanovis: $(nanovis)/timestamp966 967 clean-nanovis:968 $(clean_nanovis)969 fetch-nanovis:970 $(fetch_nanoscale)971 configure-nanovis:972 $(configure_nanovis)973 build-nanovis:974 $(build_nanovis)975 install-nanovis:976 $(install_nanovis)977 touch-nanovis:978 $(touch_nanovis)979 force-nanovis: $(librappture)/timestamp $(vtk)/timestamp980 + $(clean_nanovis)981 + $(fetch_nanovis)982 + $(configure_nanovis)983 + $(build_nanovis)984 + $(install_nanovis)985 + $(touch_nanovis)986 987 define clean_nanovis988 $(RM) -r $(nanovis)989 endef990 define fetch_nanovis991 endef992 define configure_nanovis993 $(MKDIR_P) $(nanovis)994 cd $(nanovis); $(srcdir)/packages/vizservers/$(nanovis)/configure $(nanovis_flags)995 endef996 define build_nanovis997 $(MAKE) -C $(nanovis) all998 endef999 define install_nanovis1000 $(MAKE) -C $(nanovis) install1001 endef1002 define touch_nanovis1003 touch $(nanovis)/timestamp1004 endef1005 1006 $(nanovis)/timestamp: $(librappture)/timestamp $(vtk)/timestamp1007 + $(clean_nanovis)1008 + $(fetch_nanovis)1009 + $(configure_nanovis)1010 + $(build_nanovis)1011 + $(install_nanovis)1012 + $(touch_nanovis)1013 1014 # -------------------------------------------------------------------------1015 828 # OPTIMIZER 1016 829 # ------------------------------------------------------------------------- … … 1071 884 1072 885 # ------------------------------------------------------------------------- 1073 # OSG1074 # -------------------------------------------------------------------------1075 1076 osg_flags = \1077 --with-tclsh="$(bindir)/tclsh8.4" \1078 --enable-shared \1079 $(common_flags)1080 1081 osg: $(osg)/timestamp1082 1083 clean-osg:1084 $(clean_osg)1085 fetch-osg:1086 $(fetch_osg)1087 configure-osg:1088 $(configure_osg)1089 build-osg:1090 $(build_osg)1091 install-osg:1092 $(install_osg)1093 touch-osg:1094 $(touch_osg)1095 force-osg: $(gui)/timestamp1096 + $(clean_osg)1097 + $(fetch_osg)1098 + $(configure_osg)1099 + $(build_osg)1100 + $(install_osg)1101 + $(touch_osg)1102 1103 define clean_osg1104 $(RM) -r $(osg)1105 endef1106 define fetch_osg1107 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osg)1108 endef1109 define configure_osg1110 $(MKDIR_P) $(osg)1111 cd $(osg); $(runtime)/$(osg)/configure $(osg_flags)1112 endef1113 define build_osg1114 $(MAKE) -C $(osg) all1115 endef1116 define install_osg1117 $(MAKE) -C $(osg) install1118 endef1119 define touch_osg1120 touch $(osg)/timestamp1121 endef1122 1123 $(osg)/timestamp:1124 + $(clean_osg)1125 + $(fetch_osg)1126 + $(configure_osg)1127 + $(build_osg)1128 + $(install_osg)1129 + $(touch_osg)1130 1131 # -------------------------------------------------------------------------1132 # OSGEARTH1133 # -------------------------------------------------------------------------1134 1135 osgearth_flags = \1136 --with-tclsh="$(bindir)/tclsh8.4" \1137 --enable-shared \1138 $(common_flags)1139 1140 osgearth: $(osgearth)/timestamp1141 1142 clean-osgearth:1143 $(clean_osgearth)1144 fetch-osgearth:1145 $(fetch_osgearth)1146 configure-osgearth:1147 $(configure_osgearth)1148 build-osgearth:1149 $(build_osgearth)1150 install-osgearth:1151 $(install_osgearth)1152 touch-osgearth:1153 $(touch_osgearth)1154 force-osgearth: $(gui)/timestamp1155 + $(clean_osgearth)1156 + $(fetch_osgearth)1157 + $(configure_osgearth)1158 + $(build_osgearth)1159 + $(install_osgearth)1160 + $(touch_osgearth)1161 1162 define clean_osgearth1163 $(RM) -r $(osgearth)1164 endef1165 define fetch_osgearth1166 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osgearth)1167 endef1168 define configure_osgearth1169 $(MKDIR_P) $(osgearth)1170 cd $(osgearth); $(runtime)/$(osgearth)/configure $(osgearth_flags)1171 endef1172 define build_osgearth1173 $(MAKE) -C $(osgearth) all1174 endef1175 define install_osgearth1176 $(MAKE) -C $(osgearth) install1177 endef1178 define touch_osgearth1179 touch $(osgearth)/timestamp1180 endef1181 1182 $(osgearth)/timestamp: $(osg)/timestamp1183 + $(clean_osgearth)1184 + $(fetch_osgearth)1185 + $(configure_osgearth)1186 + $(build_osgearth)1187 + $(install_osgearth)1188 + $(touch_osgearth)1189 1190 # -------------------------------------------------------------------------1191 # PYMOL1192 # -------------------------------------------------------------------------1193 1194 pymol_flags = \1195 $(common_flags)1196 1197 pymol: $(pymol)/timestamp1198 1199 clean-pymol:1200 $(clean_pymol)1201 fetch-pymol:1202 $(fetch_pymol)1203 configure-pymol:1204 $(configure_pymol)1205 build-pymol:1206 $(build_pymol)1207 install-pymol:1208 $(install_pymol)1209 touch-pymol:1210 $(touch_pymol)1211 force-pymol: $(glew)/timestamp1212 + $(clean_pymol)1213 + $(fetch_pymol)1214 + $(configure_pymol)1215 + $(build_pymol)1216 + $(install_pymol)1217 + $(touch_pymol)1218 1219 define clean_pymol1220 $(RM) -r $(pymol)1221 endef1222 define fetch_pymol1223 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(pymol)1224 endef1225 define configure_pymol1226 $(MKDIR_P) $(pymol)1227 cd $(pymol); $(runtime)/$(pymol)/configure $(pymol_flags)1228 endef1229 define build_pymol1230 $(MAKE) -C $(pymol) all1231 endef1232 define install_pymol1233 $(MAKE) -C $(pymol) install1234 endef1235 define touch_pymol1236 touch $(pymol)/timestamp1237 endef1238 1239 $(pymol)/timestamp: $(glew)/timestamp1240 + $(clean_pymol)1241 + $(fetch_pymol)1242 + $(configure_pymol)1243 + $(build_pymol)1244 + $(install_pymol)1245 + $(touch_pymol)1246 1247 1248 # -------------------------------------------------------------------------1249 # PYMOLPROXY1250 # -------------------------------------------------------------------------1251 1252 pymolproxy_flags = \1253 --with-tcllib=$(libdir) \1254 --with-statsdir=$(statsdir) \1255 $(common_flags)1256 1257 pymolproxy: $(pymolproxy)/timestamp1258 1259 clean-pymolproxy:1260 $(clean_pymolproxy)1261 fetch-pymolproxy:1262 $(fetch_pymolproxy)1263 configure-pymolproxy:1264 $(configure_pymolproxy)1265 build-pymolproxy:1266 $(build_pymolproxy)1267 install-pymolproxy:1268 $(install_pymolproxy)1269 touch-pymolproxy:1270 $(touch_pymolproxy)1271 force-pymolproxy: $(pymol)/timestamp1272 + $(clean_pymolproxy)1273 + $(fetch_pymolproxy)1274 + $(configure_pymolproxy)1275 + $(build_pymolproxy)1276 + $(install_pymolproxy)1277 + $(touch_pymolproxy)1278 1279 define clean_pymolproxy1280 $(RM) -r $(pymolproxy)1281 endef1282 define fetch_pymolproxy1283 endef1284 define configure_pymolproxy1285 $(MKDIR_P) $(pymolproxy)1286 cd $(pymolproxy); $(srcdir)/packages/vizservers/$(pymolproxy)/configure $(pymolproxy_flags)1287 endef1288 define build_pymolproxy1289 $(MAKE) -C $(pymolproxy) all1290 endef1291 define install_pymolproxy1292 $(MAKE) -C $(pymolproxy) install1293 endef1294 define touch_pymolproxy1295 touch $(pymolproxy)/timestamp1296 endef1297 1298 $(pymolproxy)/timestamp: $(pymol)/timestamp1299 + $(clean_pymolproxy)1300 + $(fetch_pymolproxy)1301 + $(configure_pymolproxy)1302 + $(build_pymolproxy)1303 + $(install_pymolproxy)1304 + $(touch_pymolproxy)1305 1306 # -------------------------------------------------------------------------1307 886 # SHAPE 1308 887 # ------------------------------------------------------------------------- … … 1398 977 endef 1399 978 define fetch_sqlitetcl 1400 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sql litetcl)979 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sqlitetcl) 1401 980 endef 1402 981 define configure_sqlitetcl 1403 982 $(MKDIR_P) $(sqlitetcl) 1404 cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/ configure $(sqlitetcl_flags)983 cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/autoconf/tea/configure $(sqlitetcl_flags) 1405 984 endef 1406 985 define build_sqlitetcl … … 1454 1033 1455 1034 define fetch_tcl 1456 sh $(srcdir)/fetch.sh trunk$(srcdir) $(tcl)1035 sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(tcl) 1457 1036 endef 1458 1037 define clean_tcl … … 1637 1216 endef 1638 1217 define configure_tester 1639 $(MKDIR_P) $(tester)1640 1218 endef 1641 1219 define build_tester … … 1833 1411 1834 1412 # ------------------------------------------------------------------------- 1835 # VIDEO1836 # -------------------------------------------------------------------------1837 1838 video_flags = \1839 --with-tclsh="$(bindir)/tclsh8.4" \1840 --enable-shared \1841 $(common_flags)1842 1843 video: $(video)/timestamp1844 1845 clean-video:1846 $(clean_video)1847 fetch-video:1848 $(fetch_video)1849 configure-video:1850 $(configure_video)1851 build-video:1852 $(build_video)1853 install-video:1854 $(install_video)1855 touch-video:1856 $(touch_video)1857 force-video: $(gui)/timestamp1858 + $(clean_video)1859 + $(fetch_video)1860 + $(configure_video)1861 + $(build_video)1862 + $(install_video)1863 + $(touch_video)1864 1865 define clean_video1866 $(RM) -r $(video)1867 endef1868 define fetch_video1869 endef1870 define configure_video1871 $(MKDIR_P) $(video)1872 cd $(video); $(srcdir)/$(video)/configure $(video_flags)1873 endef1874 define build_video1875 $(MAKE) -C $(video) all1876 endef1877 define install_video1878 $(MAKE) -C $(video) install1879 endef1880 define touch_video1881 touch $(video)/timestamp1882 endef1883 1884 $(video)/timestamp: $(gui)/timestamp1885 + $(clean_video)1886 + $(fetch_video)1887 + $(configure_video)1888 + $(build_video)1889 + $(install_video)1890 + $(touch_video)1891 1892 1893 # -------------------------------------------------------------------------1894 # VORONOI1895 # -------------------------------------------------------------------------1896 1897 voronoi_flags = \1898 --enable-shared \1899 $(common_flags)1900 1901 voronoi: $(voronoi)/timestamp1902 1903 clean-voronoi:1904 $(clean_voronoi)1905 fetch-voronoi:1906 $(fetch_voronoi)1907 configure-voronoi:1908 $(configure_voronoi)1909 build-voronoi:1910 $(build_voronoi)1911 install-voronoi:1912 $(install_voronoi)1913 touch-voronoi:1914 $(touch_voronoi)1915 force-voronoi:1916 + $(clean_voronoi)1917 + $(fetch_voronoi)1918 + $(configure_voronoi)1919 + $(build_voronoi)1920 + $(install_voronoi)1921 + $(touch_voronoi)1922 1923 define clean_voronoi1924 $(RM) -r $(voronoi)1925 endef1926 define fetch_voronoi1927 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(voronoi)1928 endef1929 define configure_voronoi1930 $(MKDIR_P) $(voronoi)1931 cd $(voronoi); $(runtime)/$(voronoi)/configure $(voronoi_flags)1932 endef1933 define build_voronoi1934 $(MAKE) -C $(voronoi) all1935 endef1936 define install_voronoi1937 $(MAKE) -C $(voronoi) install1938 endef1939 define touch_voronoi1940 touch $(voronoi)/timestamp1941 endef1942 1943 $(voronoi)/timestamp:1944 + $(clean_voronoi)1945 + $(fetch_voronoi)1946 + $(configure_voronoi)1947 + $(build_voronoi)1948 + $(install_voronoi)1949 + $(touch_voronoi)1950 1951 # -------------------------------------------------------------------------1952 1413 # VTK 1953 1414 # ------------------------------------------------------------------------- … … 1970 1431 touch-vtk: 1971 1432 $(touch_vtk) 1972 force-vtk: $(cmake)/timestamp $( glew)/timestamp $(tk)/timestamp1433 force-vtk: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp 1973 1434 + $(clean_vtk) 1974 1435 + $(fetch_vtk) … … 1982 1443 endef 1983 1444 define fetch_vtk 1984 sh $(srcdir)/fetch.sh $(TAG) $( srcdir) $(vtk)1445 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(vtk) 1985 1446 endef 1986 1447 define configure_vtk … … 1998 1459 endef 1999 1460 2000 $(vtk)/timestamp: $(cmake)/timestamp $( glew)/timestamp $(tk)/timestamp1461 $(vtk)/timestamp: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp 2001 1462 + $(clean_vtk) 2002 1463 + $(fetch_vtk) … … 2005 1466 + $(install_vtk) 2006 1467 + $(touch_vtk) 2007 2008 # -------------------------------------------------------------------------2009 # VTKVIS2010 # -------------------------------------------------------------------------2011 2012 vtkvis_flags = \2013 --with-tcllib=$(libdir) \2014 --with-rappture=$(libdir) \2015 --with-vtk="6.0" \2016 --with-vtk-includes=$(incdir) \2017 --with-vtk-libs=$(libdir) \2018 --with-statsdir=$(statsdir) \2019 $(common_flags)2020 2021 vtkvis: $(vtkvis)/timestamp2022 2023 clean-vtkvis:2024 $(clean_vtkvis)2025 fetch-vtkvis:2026 $(fetch_vtkvis)2027 configure-vtkvis:2028 $(configure_vtkvis)2029 build-vtkvis:2030 $(build_vtkvis)2031 install-vtkvis:2032 $(install_vtkvis)2033 touch-vtkvis:2034 $(touch_vtkvis)2035 force-vtkvis: $(vtk)/timestamp2036 + $(clean_vtkvis)2037 + $(fetch_vtkvis)2038 + $(configure_vtkvis)2039 + $(build_vtkvis)2040 + $(install_vtkvis)2041 + $(touch_vtkvis)2042 2043 define clean_vtkvis2044 $(RM) -r $(vtkvis)2045 endef2046 define fetch_vtkvis2047 endef2048 define configure_vtkvis2049 $(MKDIR_P) $(vtkvis)2050 cd $(vtkvis); $(srcdir)/packages/vizservers/$(vtkvis)/configure $(vtkvis_flags)2051 endef2052 define build_vtkvis2053 $(MAKE) -C $(vtkvis) all2054 endef2055 define install_vtkvis2056 $(MAKE) -C $(vtkvis) install2057 endef2058 define touch_vtkvis2059 touch $(vtkvis)/timestamp2060 endef2061 2062 $(vtkvis)/timestamp: $(vtk)/timestamp2063 + $(clean_vtkvis)2064 + $(fetch_vtkvis)2065 + $(configure_vtkvis)2066 + $(build_vtkvis)2067 + $(install_vtkvis)2068 + $(touch_vtkvis)2069 2070 # -------------------------------------------------------------------------2071 # GEOVIS2072 # -------------------------------------------------------------------------2073 2074 geovis_flags = \2075 --with-tcllib=$(libdir) \2076 --with-rappture=$(libdir) \2077 --with-vtk="6.0" \2078 --with-vtk-includes=$(incdir) \2079 --with-vtk-libs=$(libdir) \2080 --with-statsdir=$(statsdir) \2081 $(common_flags)2082 2083 geovis: $(geovis)/timestamp2084 2085 clean-geovis:2086 $(clean_geovis)2087 fetch-geovis:2088 $(fetch_geovis)2089 configure-geovis:2090 $(configure_geovis)2091 build-geovis:2092 $(build_geovis)2093 install-geovis:2094 $(install_geovis)2095 touch-geovis:2096 $(touch_geovis)2097 force-geovis: $(vtk)/timestamp2098 + $(clean_geovis)2099 + $(fetch_geovis)2100 + $(configure_geovis)2101 + $(build_geovis)2102 + $(install_geovis)2103 + $(touch_geovis)2104 2105 define clean_geovis2106 $(RM) -r $(geovis)2107 endef2108 define fetch_geovis2109 endef2110 define configure_geovis2111 $(MKDIR_P) $(geovis)2112 cd $(geovis); $(srcdir)/packages/vizservers/$(geovis)/configure $(geovis_flags)2113 endef2114 define build_geovis2115 $(MAKE) -C $(geovis) all2116 endef2117 define install_geovis2118 $(MAKE) -C $(geovis) install2119 endef2120 define touch_geovis2121 touch $(geovis)/timestamp2122 endef2123 2124 $(geovis)/timestamp: $(osgearth)/timestamp2125 + $(clean_geovis)2126 + $(fetch_geovis)2127 + $(configure_geovis)2128 + $(build_geovis)2129 + $(install_geovis)2130 + $(touch_geovis)2131 1468 2132 1469 # ------------------------------------------------------------------------- -
branches/r9/configure
r4840 r4852 622 622 #endif" 623 623 624 enable_option_checking=no625 624 ac_subst_vars='LTLIBOBJS 626 625 LIBOBJS 627 subdirs628 626 WORDSIZE 629 627 X_LIBRARIES … … 860 858 XMKMF 861 859 CXXCPP' 862 ac_subdirs_all='packages/optimizer/src ' 860 863 861 864 862 # Initialize some variables set by options. … … 10320 10318 10321 10319 10322 ac_configure_args="--disable-threads --enable-shared" 10323 10324 10325 subdirs="$subdirs packages/optimizer/src" 10326 10327 10328 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile" 10320 ac_config_files="$ac_config_files Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile packages/Makefile packages/DicomToVtk/Makefile packages/DicomToVtk/pkgIndex.tcl packages/DxToVtk/Makefile packages/DxToVtk/pkgIndex.tcl packages/PdbToVtk/Makefile packages/PdbToVtk/pkgIndex.tcl packages/diffview/Makefile packages/diffview/pkgIndex.tcl packages/hotspot/Makefile packages/hotspot/pkgIndex.tcl packages/listbox/Makefile packages/listbox/pkgIndex.tcl packages/placard/Makefile packages/placard/pkgIndex.tcl packages/readpoints/Makefile packages/readpoints/pkgIndex.tcl packages/squeezer/Makefile packages/squeezer/pkgIndex.tcl packages/system/Makefile packages/system/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile" 10329 10321 10330 10322 cat >confcache <<\_ACEOF … … 11022 11014 "src/core/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/core/config.h" ;; 11023 11015 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 11024 "packages/Makefile") CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;11025 11016 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; 11026 11017 "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;; … … 11042 11033 "gui/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES gui/pkgIndex.tcl" ;; 11043 11034 "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;; 11044 "gui/src/Makefile") CONFIG_FILES="$CONFIG_FILES gui/src/Makefile" ;;11045 11035 "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;; 11046 11036 "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;; … … 11146 11136 "examples/zoo/structure/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/structure/examples/Makefile" ;; 11147 11137 "examples/zoo/table/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/table/Makefile" ;; 11148 "video/Makefile") CONFIG_FILES="$CONFIG_FILES video/Makefile" ;; 11149 "video/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES video/pkgIndex.tcl" ;; 11138 "packages/Makefile") CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;; 11139 "packages/DicomToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/DicomToVtk/Makefile" ;; 11140 "packages/DicomToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/DicomToVtk/pkgIndex.tcl" ;; 11141 "packages/DxToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/DxToVtk/Makefile" ;; 11142 "packages/DxToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/DxToVtk/pkgIndex.tcl" ;; 11143 "packages/PdbToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/PdbToVtk/Makefile" ;; 11144 "packages/PdbToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/PdbToVtk/pkgIndex.tcl" ;; 11145 "packages/diffview/Makefile") CONFIG_FILES="$CONFIG_FILES packages/diffview/Makefile" ;; 11146 "packages/diffview/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/diffview/pkgIndex.tcl" ;; 11147 "packages/hotspot/Makefile") CONFIG_FILES="$CONFIG_FILES packages/hotspot/Makefile" ;; 11148 "packages/hotspot/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/hotspot/pkgIndex.tcl" ;; 11149 "packages/listbox/Makefile") CONFIG_FILES="$CONFIG_FILES packages/listbox/Makefile" ;; 11150 "packages/listbox/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/listbox/pkgIndex.tcl" ;; 11151 "packages/placard/Makefile") CONFIG_FILES="$CONFIG_FILES packages/placard/Makefile" ;; 11152 "packages/placard/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/placard/pkgIndex.tcl" ;; 11153 "packages/readpoints/Makefile") CONFIG_FILES="$CONFIG_FILES packages/readpoints/Makefile" ;; 11154 "packages/readpoints/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/readpoints/pkgIndex.tcl" ;; 11155 "packages/squeezer/Makefile") CONFIG_FILES="$CONFIG_FILES packages/squeezer/Makefile" ;; 11156 "packages/squeezer/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/squeezer/pkgIndex.tcl" ;; 11157 "packages/system/Makefile") CONFIG_FILES="$CONFIG_FILES packages/system/Makefile" ;; 11158 "packages/system/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/system/pkgIndex.tcl" ;; 11150 11159 "oldtest/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/Makefile" ;; 11151 11160 "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;; … … 11737 11746 $ac_cs_success || as_fn_exit 1 11738 11747 fi 11739 11740 #11741 # CONFIG_SUBDIRS section.11742 #11743 if test "$no_recursion" != yes; then11744 11745 # Remove --cache-file, --srcdir, and --disable-option-checking arguments11746 # so they do not pile up.11747 ac_sub_configure_args=11748 ac_prev=11749 eval "set x $ac_configure_args"11750 shift11751 for ac_arg11752 do11753 if test -n "$ac_prev"; then11754 ac_prev=11755 continue11756 fi11757 case $ac_arg in11758 -cache-file | --cache-file | --cache-fil | --cache-fi \11759 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)11760 ac_prev=cache_file ;;11761 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \11762 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \11763 | --c=*)11764 ;;11765 --config-cache | -C)11766 ;;11767 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)11768 ac_prev=srcdir ;;11769 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)11770 ;;11771 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)11772 ac_prev=prefix ;;11773 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)11774 ;;11775 --disable-option-checking)11776 ;;11777 *)11778 case $ac_arg in11779 *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;11780 esac11781 as_fn_append ac_sub_configure_args " '$ac_arg'" ;;11782 esac11783 done11784 11785 # Always prepend --prefix to ensure using the same prefix11786 # in subdir configurations.11787 ac_arg="--prefix=$prefix"11788 case $ac_arg in11789 *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;11790 esac11791 ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"11792 11793 # Pass --silent11794 if test "$silent" = yes; then11795 ac_sub_configure_args="--silent $ac_sub_configure_args"11796 fi11797 11798 # Always prepend --disable-option-checking to silence warnings, since11799 # different subdirs can have different --enable and --with options.11800 ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"11801 11802 ac_popdir=`pwd`11803 for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue11804 11805 # Do not complain, so a configure script can configure whichever11806 # parts of a large source tree are present.11807 test -d "$srcdir/$ac_dir" || continue11808 11809 ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"11810 $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&511811 $as_echo "$ac_msg" >&611812 as_dir="$ac_dir"; as_fn_mkdir_p11813 ac_builddir=.11814 11815 case "$ac_dir" in11816 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;11817 *)11818 ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`11819 # A ".." for each directory in $ac_dir_suffix.11820 ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`11821 case $ac_top_builddir_sub in11822 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;11823 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;11824 esac ;;11825 esac11826 ac_abs_top_builddir=$ac_pwd11827 ac_abs_builddir=$ac_pwd$ac_dir_suffix11828 # for backward compatibility:11829 ac_top_builddir=$ac_top_build_prefix11830 11831 case $srcdir in11832 .) # We are building in place.11833 ac_srcdir=.11834 ac_top_srcdir=$ac_top_builddir_sub11835 ac_abs_top_srcdir=$ac_pwd ;;11836 [\\/]* | ?:[\\/]* ) # Absolute name.11837 ac_srcdir=$srcdir$ac_dir_suffix;11838 ac_top_srcdir=$srcdir11839 ac_abs_top_srcdir=$srcdir ;;11840 *) # Relative name.11841 ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix11842 ac_top_srcdir=$ac_top_build_prefix$srcdir11843 ac_abs_top_srcdir=$ac_pwd/$srcdir ;;11844 esac11845 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix11846 11847 11848 cd "$ac_dir"11849 11850 # Check for guested configure; otherwise get Cygnus style configure.11851 if test -f "$ac_srcdir/configure.gnu"; then11852 ac_sub_configure=$ac_srcdir/configure.gnu11853 elif test -f "$ac_srcdir/configure"; then11854 ac_sub_configure=$ac_srcdir/configure11855 elif test -f "$ac_srcdir/configure.in"; then11856 # This should be Cygnus configure.11857 ac_sub_configure=$ac_aux_dir/configure11858 else11859 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&511860 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}11861 ac_sub_configure=11862 fi11863 11864 # The recursion is here.11865 if test -n "$ac_sub_configure"; then11866 # Make the cache file name correct relative to the subdirectory.11867 case $cache_file in11868 [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;11869 *) # Relative name.11870 ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;11871 esac11872 11873 { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&511874 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}11875 # The eval makes quoting arguments work.11876 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \11877 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||11878 as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 511879 fi11880 11881 cd "$ac_popdir"11882 done11883 fi11884 11748 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 11885 11749 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -
branches/r9/configure.in
r4840 r4852 453 453 AC_SUBST(WORDSIZE) 454 454 455 ac_configure_args="--disable-threads --enable-shared"456 AC_CONFIG_SUBDIRS( [packages/optimizer/src] )457 458 455 dnl read Makefile.in and write Makefile 459 456 AC_CONFIG_FILES([ 460 457 Makefile 461 packages/Makefile462 458 src/Makefile 463 459 src/core/Makefile … … 479 475 gui/pkgIndex.tcl 480 476 gui/scripts/Makefile 481 gui/src/Makefile482 477 builder/Makefile 483 478 builder/pkgIndex.tcl … … 583 578 examples/zoo/structure/examples/Makefile 584 579 examples/zoo/table/Makefile 585 video/Makefile 586 video/pkgIndex.tcl 580 packages/Makefile 581 packages/DicomToVtk/Makefile 582 packages/DicomToVtk/pkgIndex.tcl 583 packages/DxToVtk/Makefile 584 packages/DxToVtk/pkgIndex.tcl 585 packages/PdbToVtk/Makefile 586 packages/PdbToVtk/pkgIndex.tcl 587 packages/diffview/Makefile 588 packages/diffview/pkgIndex.tcl 589 packages/hotspot/Makefile 590 packages/hotspot/pkgIndex.tcl 591 packages/listbox/Makefile 592 packages/listbox/pkgIndex.tcl 593 packages/placard/Makefile 594 packages/placard/pkgIndex.tcl 595 packages/readpoints/Makefile 596 packages/readpoints/pkgIndex.tcl 597 packages/squeezer/Makefile 598 packages/squeezer/pkgIndex.tcl 599 packages/system/Makefile 600 packages/system/pkgIndex.tcl 587 601 oldtest/Makefile 588 602 oldtest/src/Makefile -
branches/r9/fetch.sh
r4840 r4852 10 10 url="https://nanohub.org/infrastructure" 11 11 if test -d "$destdir/$pkgdir" ; then 12 echo svn update $destdir/$pkgdir 12 13 svn update $destdir/$pkgdir 13 14 else 15 echo svn co -q $url/rappture-runtime/svn/$path/$pkgdir $destdir/$pkgdir 14 16 svn co -q $url/rappture-runtime/svn/$path/$pkgdir $destdir/$pkgdir 15 17 fi -
branches/r9/gui/Makefile.in
r3471 r4852 26 26 pkgIndex.tcl 27 27 28 SUBDIRS = s rc scripts apps28 SUBDIRS = scripts apps 29 29 30 30 .PHONY: all install test clean distclean $(SUBDIRS) -
branches/r9/lang/tcl/src/Makefile.in
r4146 r4852 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@31 HAVE_NCURSES = @HAVE_LIBNCURSES@32 30 33 31 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 53 51 LIBS = \ 54 52 -L../../../src/core -lrappture \ 55 $(TCL_LIB_SPEC) -l ncurses -lexpat -lz -lm -lstdc++53 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ 56 54 57 55 OBJS = \ 58 56 Rappture_Init.o \ 59 RpCurses.o \60 RpDaemon.o \61 57 RpEncodeTclInterface.o \ 62 RpOp.o \63 RpRlimit.o \64 RpRusage.o \65 RpSignal.o \66 RpSlice.o \67 RpSysinfo.o \68 Switch.o \69 58 RpUnitsTclInterface.o \ 70 59 RpUtilsTclInterface.o 71 72 ifeq ($(WIN32),"")73 OBJS += RpWinResource.o74 endif75 76 ifeq ($(HAVE_LIBCURSES),yes)77 OBJS += RpCurses.o78 LIBS += -lncurses79 endif80 60 81 61 # Not using RpLibraryTclInterface.o \ -
branches/r9/lang/tcl/src/Rappture_Init.c
r3736 r4852 67 67 return TCL_ERROR; 68 68 } 69 if (RpRlimit_Init(interp) != TCL_OK) {70 return TCL_ERROR;71 }72 if (RpRusage_Init(interp) != TCL_OK) {73 return TCL_ERROR;74 }75 if (RpSignal_Init(interp) != TCL_OK) {76 return TCL_ERROR;77 }78 if (RpSlice_Init(interp) != TCL_OK) {79 return TCL_ERROR;80 }81 if (RpSysinfo_Init(interp) != TCL_OK) {82 return TCL_ERROR;83 }84 if (RpDaemon_Init(interp) != TCL_OK) {85 return TCL_ERROR;86 }87 if (RpCurses_Init(interp) != TCL_OK) {88 return TCL_ERROR;89 }90 69 return TCL_OK; 91 70 } -
branches/r9/packages/DicomToVtk/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 35 37 INCLUDES = \ 36 38 -I$(srcdir) \ 37 -I../src/core \ 38 -I$(srcdir)/../src/core \ 39 -I$(srcdir)/../src/objects \ 40 -I$(includedir) 39 -I$(includedir)/vtk-6.0 \ 40 -I$(includedir) 41 41 42 42 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 43 $(TCL_LIB_SPEC) \ 44 $(TK_LIB_SPEC) \ 46 45 47 46 version = @PACKAGE_VERSION@ … … 57 56 58 57 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 58 RpDicomToVtk.o 62 59 63 name = RapptureVideo$(version)64 libname 65 lib 66 destdir 60 name = RapptureDicomToVtk$(version) 61 libname = $(name) 62 lib = $(libname)$(SHLIB_SUFFIX) 63 destdir = $(libdir)/$(name) 67 64 68 65 .PHONY: all install clean distclean -
branches/r9/packages/DxToVtk/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 46 47 47 48 version = @PACKAGE_VERSION@ … … 57 58 58 59 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 60 RpDxToVtk.o 62 61 63 name = Rappture Video$(version)62 name = RapptureDxToVtk$(version) 64 63 libname = $(name) 65 64 lib = $(libname)$(SHLIB_SUFFIX) … … 79 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 79 81 .c c.o:80 .cpp.o: 82 81 $(CXX) $(CXX_SWITCHES) -c $? 83 82 .c.o: -
branches/r9/packages/Makefile.in
r4844 r4852 14 14 RM = rm -f 15 15 VPATH = $(srcdir) 16 HAVE_VTK = @HAVE_VTK@ 16 17 17 subdirs = \ 18 SUBDIRS = \ 19 diffview \ 18 20 hotspot \ 21 listbox \ 19 22 placard \ 20 DicomToVtk \ 21 DiffView \ 22 DxToVtk \ 23 listbox \ 24 PdbToVtk \ 25 ReadPoints \ 23 readpoints \ 26 24 squeezer \ 27 system \ 28 optimizer \ 29 video 25 system 26 27 ifeq ($(HAVE_VTK),yes) 28 SUBDIRS += DicomToVtk DxToVtk PdbToVtk 29 endif 30 31 .PHONY: all install test clean distclean $(SUBDIRS) 30 32 31 33 all: 34 for i in $(SUBDIRS) ; do \ 35 $(MAKE) -C $$i all || exit 1 ;\ 36 done 32 37 33 optimizer:34 $(MAKE) -C optimizer/src all35 38 install: 36 $(MAKE) -C optimizer/src install 39 $(MKDIR_P) -m 0755 $(destdir) 40 for i in $(FILES); do \ 41 echo "Installing $$i" ; \ 42 $(INSTALL) -m 0444 $$i $(destdir) ; \ 43 done 44 for i in $(SUBDIRS) ; do \ 45 $(MAKE) -C $$i install || exit 1 ;\ 46 done 37 47 38 48 clean: 39 $(MAKE) -C optimizer/src clean 49 for i in $(SUBDIRS) ; do \ 50 $(MAKE) -C $$i clean ;\ 51 done 40 52 41 53 distclean: 42 $(MAKE) -C optimizer/src distclean 43 $(RM) Makefile *~ 54 for i in $(SUBDIRS) ; do \ 55 $(MAKE) -C $$i distclean ;\ 56 done 44 57 -
branches/r9/packages/PdbToVtk/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 46 47 47 48 version = @PACKAGE_VERSION@ … … 57 58 58 59 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 60 pdbToVtk.o 62 61 63 name = Rappture Video$(version)62 name = RappturePdbToVtk$(version) 64 63 libname = $(name) 65 64 lib = $(libname)$(SHLIB_SUFFIX) … … 79 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 79 81 .c c.o:80 .cpp.o: 82 81 $(CXX) $(CXX_SWITCHES) -c $? 83 82 .c.o: -
branches/r9/packages/diffview/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 46 47 47 48 version = @PACKAGE_VERSION@ … … 57 58 58 59 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 60 diffview.o 62 61 63 name = Rappture Video$(version)62 name = RapptureDiffView$(version) 64 63 libname = $(name) 65 64 lib = $(libname)$(SHLIB_SUFFIX) … … 79 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 79 81 .c c.o:80 .cpp.o: 82 81 $(CXX) $(CXX_SWITCHES) -c $? 83 82 .c.o: -
branches/r9/packages/diffview/diffview.c
r4851 r4852 414 414 }; 415 415 416 /*417 * ------------------------------------------------------------------------418 * RpDiffview_Init --419 *420 * Invoked when the Rappture GUI library is being initialized421 * to install the "diffview" widget into the interpreter.422 *423 * Returns TCL_OK if successful, or TCL_ERROR (along with an error424 * message in the interp) if anything goes wrong.425 * ------------------------------------------------------------------------426 */427 int428 RpDiffview_Init(interp)429 Tcl_Interp *interp; /* interpreter being initialized */430 {431 static char *script = "source [file join $RapptureGUI::library scripts diffview.tcl]";432 433 /* install the widget command */434 Tcl_CreateObjCommand(interp, "Rappture::Diffview", DiffviewObjCmd,435 NULL, NULL);436 437 /* load the default bindings */438 if (Tcl_Eval(interp, script) != TCL_OK) {439 return TCL_ERROR;440 }441 442 return TCL_OK;443 }444 416 445 417 /* … … 2796 2768 } 2797 2769 } 2770 2771 /* 2772 * ------------------------------------------------------------------------ 2773 * RapptureDiffview_Init -- 2774 * 2775 * Invoked when the Rappture GUI library is being initialized 2776 * to install the "diffview" widget into the interpreter. 2777 * 2778 * Returns TCL_OK if successful, or TCL_ERROR (along with an error 2779 * message in the interp) if anything goes wrong. 2780 * ------------------------------------------------------------------------ 2781 */ 2782 int 2783 RapptureDiffview_Init(interp) 2784 Tcl_Interp *interp; /* interpreter being initialized */ 2785 { 2786 static char *script = "source [file join $RapptureGUI::library scripts diffview.tcl]"; 2787 2788 /* install the widget command */ 2789 Tcl_CreateObjCommand(interp, "Rappture::diffview", DiffviewObjCmd, 2790 NULL, NULL); 2791 2792 /* load the default bindings */ 2793 if (Tcl_Eval(interp, script) != TCL_OK) { 2794 return TCL_ERROR; 2795 } 2796 return TCL_OK; 2797 } -
branches/r9/packages/hotspot/Makefile.in
r4842 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture\44 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++\45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 45 47 46 48 version = @PACKAGE_VERSION@ … … 56 58 57 59 OBJS = \ 58 canvHotspot.o60 hotspot.o 59 61 60 62 name = RapptureCanvasHotspot$(version) -
branches/r9/packages/hotspot/hotspot.c
r4844 r4852 1827 1827 /* 1828 1828 * ------------------------------------------------------------------------ 1829 * R pCanvHotspot_Init --1829 * RapptureCanvasHotspot_Init -- 1830 1830 * 1831 1831 * Invoked when the Rappture GUI library is being initialized … … 1837 1837 */ 1838 1838 int 1839 R pCanvHotspot_Init(interp)1839 RapptureCanvasHotspot_Init(interp) 1840 1840 Tcl_Interp *interp; /* interpreter being initialized */ 1841 1841 { -
branches/r9/packages/listbox/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 46 47 47 48 version = @PACKAGE_VERSION@ … … 57 58 58 59 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 60 RpListbox.o 62 61 63 name = Rappture Video$(version)62 name = RapptureListbox$(version) 64 63 libname = $(name) 65 64 lib = $(libname)$(SHLIB_SUFFIX) … … 79 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 79 81 .c c.o:80 .cpp.o: 82 81 $(CXX) $(CXX_SWITCHES) -c $? 83 82 .c.o: -
branches/r9/packages/listbox/RpListbox.c
r4841 r4852 33 33 * RCS: @(#) $Id: tkListbox.c,v 1.29.2.5 2007/04/29 02:24:02 das Exp $ 34 34 */ 35 #include "tkPort.h" 36 #include "default.h" 37 #include "tkInt.h" 38 39 #ifdef WIN32 40 #include "tkWinInt.h" 35 36 #include <stdlib.h> 37 #include <string.h> 38 #include <X11/Xatom.h> 39 #include <X11/Xproto.h> 40 41 #include <tcl.h> 42 #include <tk.h> 43 44 #define BLACK "#000000" 45 #define WHITE "#ffffff" 46 47 #define NORMAL_BG "#d9d9d9" 48 #define ACTIVE_BG "#ececec" 49 #define SELECT_BG "#c3c3c3" 50 #define DISABLED "#a3a3a3" 51 52 #define DEF_LISTBOX_BG_MONO WHITE 53 #define DEF_LISTBOX_BORDER_WIDTH "1" 54 #define DEF_LISTBOX_CURSOR "" 55 #define DEF_LISTBOX_DISABLED_FG DISABLED 56 #define DEF_LISTBOX_EXPORT_SELECTION "1" 57 #define DEF_LISTBOX_HEIGHT "10" 58 #define DEF_LISTBOX_HIGHLIGHT_BG NORMAL_BG 59 #define DEF_LISTBOX_LIST_VARIABLE "" 60 #define DEF_LISTBOX_SCROLL_COMMAND "" 61 #define DEF_LISTBOX_SELECT_BD "0" 62 #define DEF_LISTBOX_SELECT_COLOR SELECT_BG 63 #define DEF_LISTBOX_SELECT_FG_MONO WHITE 64 #define DEF_LISTBOX_SELECT_MODE "browse" 65 #define DEF_LISTBOX_SELECT_MONO BLACK 66 #define DEF_LISTBOX_SET_GRID "0" 67 #define DEF_LISTBOX_STATE "normal" 68 #define DEF_LISTBOX_TAKE_FOCUS (char *) NULL 69 #define DEF_LISTBOX_WIDTH "20" 70 71 #if defined(__WIN32__) || defined(_WIN32) || defined(__MINGW32__) 72 #define DEF_LISTBOX_ACTIVE_STYLE "underline" 73 #define DEF_LISTBOX_BG_COLOR "SystemWindow" 74 #define DEF_LISTBOX_FG NORMAL_FG 75 #define DEF_LISTBOX_FONT "TkDefaultFont" 76 #define DEF_LISTBOX_HIGHLIGHT HIGHLIGHT 77 #define DEF_LISTBOX_HIGHLIGHT_WIDTH "1" 78 #define DEF_LISTBOX_RELIEF "sunken" 79 #define DEF_LISTBOX_SELECT_FG_COLOR SELECT_FG 80 #else 81 # if defined(MAC_OSX_TK) 82 #define DEF_LISTBOX_ACTIVE_STYLE "dotbox" 83 #define DEF_LISTBOX_BG_COLOR WHITE 84 #define DEF_LISTBOX_FG BLACK 85 #define DEF_LISTBOX_FONT "TkTextFont" 86 #define DEF_LISTBOX_HIGHLIGHT BLACK 87 #define DEF_LISTBOX_HIGHLIGHT_WIDTH "0" 88 #define DEF_LISTBOX_RELIEF "solid" 89 #define DEF_LISTBOX_SELECT_FG_COLOR SELECT_FG 90 # else 91 #define DEF_LISTBOX_ACTIVE_STYLE "dotbox" 92 #define DEF_LISTBOX_BG_COLOR WHITE 93 #define DEF_LISTBOX_FG BLACK 94 #define DEF_LISTBOX_FONT "TkDefaultFont" 95 #define DEF_LISTBOX_HIGHLIGHT BLACK 96 #define DEF_LISTBOX_HIGHLIGHT_WIDTH "1" 97 #define DEF_LISTBOX_RELIEF "sunken" 98 #define DEF_LISTBOX_SELECT_FG_COLOR BLACK 99 # endif 41 100 #endif 42 101 … … 821 880 */ 822 881 for (i = 0; i < listPtr->nElements; i++) { 823 if (Tcl_FindHashEntry(listPtr->selection, (char *)i) != NULL) { 882 long key; 883 key = index; 884 if (Tcl_FindHashEntry(listPtr->selection,(char *)key) != NULL) { 824 885 sprintf(indexStringRep, "%d", i); 825 886 Tcl_AppendElement(interp, indexStringRep); … … 1361 1422 } 1362 1423 case SELECTION_INCLUDES: { 1424 long key = first; 1363 1425 if (objc != 4) { 1364 1426 Tcl_WrongNumArgs(interp, 3, objv, "index"); … … 1367 1429 Tcl_SetObjResult(interp, 1368 1430 Tcl_NewBooleanObj((Tcl_FindHashEntry(listPtr->selection, 1369 (char *) first) != NULL)));1431 (char *)key) != NULL))); 1370 1432 result = TCL_OK; 1371 1433 break; … … 1559 1621 Tcl_HashEntry *entry; 1560 1622 ItemAttr *attrs; 1561 1562 entry = Tcl_CreateHashEntry(listPtr->itemAttrTable, (char *)index, &new); 1623 long key = index; 1624 1625 entry = Tcl_CreateHashEntry(listPtr->itemAttrTable, (char *)key, &new); 1563 1626 if (new) { 1564 1627 attrs = (ItemAttr *) ckalloc(sizeof(ItemAttr)); … … 2065 2128 */ 2066 2129 if (listPtr->state & STATE_NORMAL) { 2067 if (Tcl_FindHashEntry(listPtr->selection, (char *)i) != NULL) { 2130 long key = i; 2131 if (Tcl_FindHashEntry(listPtr->selection, (char *)key) != NULL) { 2068 2132 /* Selected items are drawn differently. */ 2069 2133 gc = listPtr->selTextGC; … … 2240 2304 listPtr->borderWidth, listPtr->relief); 2241 2305 if (listPtr->highlightWidth > 0) { 2242 GC fgGC, bgGC; 2243 2306 GC bgGC; 2307 2308 /* There's no public stub for TkpDrawHighlightBorder, so fall back 2309 * to Tk_DrawFocusHighlight. Only on problem on the Mac. */ 2244 2310 bgGC = Tk_GCForColor(listPtr->highlightBgColorPtr, pixmap); 2245 if (listPtr->flags & GOT_FOCUS) { 2246 fgGC = Tk_GCForColor(listPtr->highlightColorPtr, pixmap); 2247 TkpDrawHighlightBorder(tkwin, fgGC, bgGC, 2248 listPtr->highlightWidth, pixmap); 2249 } else { 2250 TkpDrawHighlightBorder(tkwin, bgGC, bgGC, 2251 listPtr->highlightWidth, pixmap); 2252 } 2311 Tk_DrawFocusHighlight(tkwin, bgGC, listPtr->highlightWidth, 2312 pixmap); 2253 2313 } 2254 2314 #ifndef TK_NO_DOUBLE_BUFFERING … … 2743 2803 */ 2744 2804 for (i = first; i <= last; i++) { 2805 long key = i; 2745 2806 /* Remove selection information */ 2746 entry = Tcl_FindHashEntry(listPtr->selection, (char *) i);2807 entry = Tcl_FindHashEntry(listPtr->selection, (char *)key); 2747 2808 if (entry != NULL) { 2748 2809 listPtr->numSelected--; … … 2750 2811 } 2751 2812 2752 entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *) i);2813 entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)key); 2753 2814 if (entry != NULL) { 2754 2815 ckfree((char *)Tcl_GetHashValue(entry)); … … 3417 3478 */ 3418 3479 for (i = first; i <= last; i++) { 3419 entry = Tcl_FindHashEntry(listPtr->selection, (char *)i); 3480 long key = i; 3481 entry = Tcl_FindHashEntry(listPtr->selection, (char *)key); 3420 3482 if (entry != NULL) { 3421 3483 if (!select) { … … 3429 3491 if (select) { 3430 3492 entry = Tcl_CreateHashEntry(listPtr->selection, 3431 (char *) i, &new);3493 (char *)key, &new); 3432 3494 Tcl_SetHashValue(entry, (ClientData) NULL); 3433 3495 listPtr->numSelected++; … … 3505 3567 Tcl_DStringInit(&selection); 3506 3568 for (i = 0; i < listPtr->nElements; i++) { 3507 entry = Tcl_FindHashEntry(listPtr->selection, (char *)i); 3569 long key = i; 3570 entry = Tcl_FindHashEntry(listPtr->selection, (char *)key); 3508 3571 if (entry != NULL) { 3509 3572 if (needNewline) { … … 3787 3850 if (offset > 0) { 3788 3851 for (i = last; i >= first; i--) { 3789 entry = Tcl_FindHashEntry(table, (char *)i); 3852 long key = i; 3853 entry = Tcl_FindHashEntry(table, (char *)key); 3790 3854 if (entry != NULL) { 3791 3855 clientData = Tcl_GetHashValue(entry); 3792 3856 Tcl_DeleteHashEntry(entry); 3793 entry = Tcl_CreateHashEntry(table, (char *)( i +offset), &new);3857 entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new); 3794 3858 Tcl_SetHashValue(entry, clientData); 3795 3859 } … … 3797 3861 } else { 3798 3862 for (i = first; i <= last; i++) { 3799 entry = Tcl_FindHashEntry(table, (char *)i); 3863 long key = i; 3864 entry = Tcl_FindHashEntry(table, (char *)key); 3800 3865 if (entry != NULL) { 3801 3866 clientData = Tcl_GetHashValue(entry); 3802 3867 Tcl_DeleteHashEntry(entry); 3803 entry = Tcl_CreateHashEntry(table, (char *)( i +offset), &new);3868 entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new); 3804 3869 Tcl_SetHashValue(entry, clientData); 3805 3870 } -
branches/r9/packages/placard/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture\44 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++\45 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 47 M 46 48 version = @PACKAGE_VERSION@ 47 49 DEFINES = -DPACKAGE_VERSION=\"$(version)\" … … 55 57 56 58 57 OBJS = canvPlacard.o 59 OBJS = \ 60 canvPlacard.o 58 61 59 62 name = RapptureCanvasPlacard$(version) … … 75 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 76 79 77 .c c.o:80 .cpp.o: 78 81 $(CXX) $(CXX_SWITCHES) -c $? 79 82 .c.o: -
branches/r9/packages/placard/canvPlacard.c
r4842 r4852 413 413 414 414 415 /*416 * ------------------------------------------------------------------------417 * RpCanvPlacard_Init --418 *419 * Invoked when the Rappture GUI library is being initialized420 * to install the "placard" item on the Tk canvas widget.421 *422 * Returns TCL_OK if successful, or TCL_ERROR (along with an error423 * message in the interp) if anything goes wrong.424 * ------------------------------------------------------------------------425 */426 int427 RpCanvPlacard_Init(interp)428 Tcl_Interp *interp; /* interpreter being initialized */429 {430 Tk_CreateItemType(&rpPlacardType);431 432 Tk_DefineBitmap(interp, Tk_GetUid("rp_ellipsis"),433 (char*)ellipsis_bits, ellipsis_width, ellipsis_height);434 435 return TCL_OK;436 }437 415 438 416 /* … … 1459 1437 return; 1460 1438 } 1439 1440 /* 1441 * ------------------------------------------------------------------------ 1442 * RapptureCanvasPlacard_Init -- 1443 * 1444 * Invoked when the Rappture GUI library is being initialized 1445 * to install the "placard" item on the Tk canvas widget. 1446 * 1447 * Returns TCL_OK if successful, or TCL_ERROR (along with an error 1448 * message in the interp) if anything goes wrong. 1449 * ------------------------------------------------------------------------ 1450 */ 1451 int 1452 RapptureCanvasPlacard_Init(interp) 1453 Tcl_Interp *interp; /* interpreter being initialized */ 1454 { 1455 Tk_CreateItemType(&rpPlacardType); 1456 1457 Tk_DefineBitmap(interp, Tk_GetUid("rp_ellipsis"), 1458 (char*)ellipsis_bits, ellipsis_width, ellipsis_height); 1459 1460 return TCL_OK; 1461 } -
branches/r9/packages/readpoints/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 41 43 42 44 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 45 $(TCL_LIB_SPEC) \ 46 $(TK_LIB_SPEC) \ 46 47 47 48 version = @PACKAGE_VERSION@ … … 57 58 58 59 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 60 readPoints.o 62 61 63 name = Rappture Video$(version)62 name = RapptureReadPoints$(version) 64 63 libname = $(name) 65 64 lib = $(libname)$(SHLIB_SUFFIX) … … 79 78 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 79 81 .c c.o:80 .cpp.o: 82 81 $(CXX) $(CXX_SWITCHES) -c $? 83 82 .c.o: -
branches/r9/packages/readpoints/readPoints.c
r4841 r4852 167 167 /* 168 168 * ------------------------------------------------------------------------ 169 * R pReadPoints_Init --169 * RapptureReadPoints_Init -- 170 170 * 171 171 * Invoked when the Rappture GUI library is being initialized 172 * to install the " ConvertDxToVtk" command into the interpreter.172 * to install the "readpoints" command into the interpreter. 173 173 * 174 174 * Returns TCL_OK if successful, or TCL_ERROR (along with an error … … 177 177 */ 178 178 int 179 R pReadPoints_Init(Tcl_Interp *interp)179 RapptureReadPoints_Init(Tcl_Interp *interp) 180 180 { 181 181 /* install the widget command */ 182 Tcl_CreateObjCommand(interp, "Rappture:: ReadPoints", ReadPoints,182 Tcl_CreateObjCommand(interp, "Rappture::readpoints", ReadPoints, 183 183 NULL, NULL); 184 184 return TCL_OK; -
branches/r9/packages/squeezer/Makefile.in
r4843 r4852 21 21 SHLIB_LD = @SHLIB_LD@ 22 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@23 SHLIB_LDFLAGS = @CC_SEARCH_FLAGS@ 24 24 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ … … 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 32 LIB_RUNTIME_DIR = $(libdir) 31 33 32 34 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 35 37 INCLUDES = \ 36 38 -I$(srcdir) \ 37 -I../src/core \38 -I$(srcdir)/../src/core \39 -I$(srcdir)/../src/objects \40 39 -I$(includedir) 41 40 42 41 LIBS = \ 43 -L../src/core -lrappture \ 44 -lavcodec -lavformat -lswscale \ 45 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \ 42 $(TCL_LIB_SPEC) \ 43 $(TK_LIB_SPEC) \ 46 44 47 45 version = @PACKAGE_VERSION@ … … 57 55 58 56 OBJS = \ 59 RpVideoTclInterface.o \ 60 RpOp.o \ 61 RpVideo.o 57 RpSqueezer.o 62 58 63 name = RapptureVideo$(version)64 libname 65 lib 66 destdir 59 name = RapptureSqueezer$(version) 60 libname = $(name) 61 lib = $(libname)$(SHLIB_SUFFIX) 62 destdir = $(libdir)/$(name) 67 63 68 64 .PHONY: all install clean distclean … … 79 75 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 80 76 81 .c c.o:77 .cpp.o: 82 78 $(CXX) $(CXX_SWITCHES) -c $? 83 79 .c.o: -
branches/r9/packages/squeezer/RpSqueezer.c
r4841 r4852 30 30 Tcl_Interp *interp, int argc, CONST char **argv)); 31 31 32 /*33 * ------------------------------------------------------------------------34 * RpSqueezer_Init --35 *36 * Installs the "squeezer" command in a Tcl interpreter.37 *38 * Returns TCL_OK if successful, or TCL_ERROR (along with an error39 * message in the interp) if anything goes wrong.40 * ------------------------------------------------------------------------41 */42 int43 RpSqueezer_Init(interp)44 Tcl_Interp *interp; /* interpreter being initialized */45 {46 /* install the widget command */47 Tcl_CreateCommand(interp, "squeezer", RpSqueezerCmd,48 NULL, NULL);49 50 return TCL_OK;51 }52 32 53 33 /* … … 199 179 } 200 180 } 181 #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5) 182 if (Tk_PhotoSetSize(interp, destPhoto, destw, srch) != TCL_OK) { 183 return TCL_ERROR; 184 } 185 if (Tk_PhotoPutBlock(interp, destPhoto, &destBlock, 0, 0, destBlock.width, 186 destBlock.height, TK_PHOTO_COMPOSITE_SET) != TCL_OK) { 187 return TCL_ERROR; 188 } 189 #else 201 190 Tk_PhotoSetSize(destPhoto, destw, srch); 202 191 Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0, 203 192 destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET); 204 193 #endif 205 194 ckfree((char*)destBlock.pixelPtr); 206 195 return TCL_OK; 207 196 } 197 198 /* 199 * ------------------------------------------------------------------------ 200 * RapptureSqueezer_Init -- 201 * 202 * Installs the "squeezer" command in a Tcl interpreter. 203 * 204 * Returns TCL_OK if successful, or TCL_ERROR (along with an error 205 * message in the interp) if anything goes wrong. 206 * ------------------------------------------------------------------------ 207 */ 208 int 209 RapptureSqueezer_Init(interp) 210 Tcl_Interp *interp; /* interpreter being initialized */ 211 { 212 /* install the widget command */ 213 Tcl_CreateCommand(interp, "squeezer", RpSqueezerCmd, 214 NULL, NULL); 215 216 return TCL_OK; 217 }
Note: See TracChangeset
for help on using the changeset viewer.