Changeset 4852 for branches


Ignore:
Timestamp:
Dec 12, 2014 7:16:36 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
18 added
8 deleted
21 edited
9 copied
6 moved

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4840 r4852  
    1515WORDSIZE =              @WORDSIZE@
    1616version = $(RAPPTURE_MAJOR_VERSION).$(RAPPTURE_MINOR_VERSION).$(RAPPTURE_RELEASE_SERIAL)
    17 runtime =               $(shell cd ../runtime; pwd)
    18 TAG =                   trunk
     17runtime =               $(shell cd ../rappture/runtime; pwd)
     18TAG =                   branches/blt4
    1919
    2020# ------------------------------------------------------------------------
     
    6464
    6565targets = \
    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
    7169
    7270.PHONY: $(targets)
     
    7472.NOTPARALLEL:
    7573
    76 all: gui
    77 
    78 fullpkg: tester builder renderservers
    79 
    80 renderservers: nanoscale nanovis vtkvis geovis pymolproxy
     74all: gui packages lang
     75
     76fullpkg: tester builder packages
    8177
    8278libshell: $(tcllib)/timestamp $(tls)/timestamp $(itcl)/timestamp
     
    8480# Aliases for package directory names.
    8581
    86 blt = blt2.4z
    87 builder = builder
    88 cmake = cmake-2.8.12
    89 examples =examples
    90 expat = expat-2.0.1
     82blt = blt4
     83cmake = cmake-2.8.12.2
     84examples = examples
     85expat = expat-2.1.0
    9186expect = expect5.45
    92 glew = glew
     87freetype = freetype-2.5.3
    9388gui = gui
    9489htmlwidget = htmlwidget-3a14
    95 itcl = itcl3.3
     90itcl = itcl3.4
    9691itk = itk3.3
     92jpeg = jpeg-8d
     93libpng = libpng-1.6.15
     94librappture = librappture
     95openssl = openssl-1.0.1j
     96optimizer = optimizer
     97shape = shape0.4
     98sqlitetcl = sqlite-src-3080703
     99sqlitetcl = sqlite-3071502
     100tcl = tcl8.5.10
     101tcllib = tcllib-1.15
     102tdom = tDOM-0.8.3
     103tiff = tiff-4.0.3
     104tk = tk8.5.10
     105tkimg = tkimg1.4
     106tls = tls1.6
     107vtk = vtk-6.0.0
     108zlib = zlib
     109tester = tester
     110builder = builder
    97111lang = lang
    98 librappture = librappture
    99 nanoscale = nanoscale
    100 nanovis = nanovis
    101 optimizer = optimizer
    102 osg = OpenSceneGraph-3.2.0
    103 osgearth = osgearth-2.5
    104 pymol = pymol
    105 pymolproxy = pymolproxy
    106 shape = shape0.4
    107 sqlitetcl = sqlite-3071502/tea
    108 tcl = tcl8.4.19
    109 tcllib = tcllib-1.12
    110 tdom = tDOM-0.8.2
    111 tester = tester
    112 tk = tk8.4.19
    113 tkimg = tkimg1.3
    114 tls = tls1.6
    115 video = video
    116 voronoi = voronoi
    117 vtk = vtk-6.0.0
    118 vtkvis = vtkvis
    119 geovis = geovis
    120 zlib = zlib
    121112
    122113subdirs = \
    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) \
    126117        $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tester) $(tk) $(tkimg) \
    127         $(tls) $(video) $(voronoi) $(vtk) $(vtkvis) $(zlib) $(geovis)
     118        $(tls) $(vtk) $(zlib)
    128119
    129120
     
    474465        + $(install_expect)
    475466        + $(touch_expect)
    476 
    477 # -------------------------------------------------------------------------
    478 #  GLEW
    479 # -------------------------------------------------------------------------
    480 
    481 glew_flags =    \
    482         --enable-shared \
    483         $(common_flags)
    484 
    485 glew: $(glew)/timestamp
    486 
    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_glew
    508         $(RM) -r $(glew)
    509 endef
    510 define fetch_glew
    511         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(glew)
    512 endef
    513 define configure_glew
    514         $(MKDIR_P) $(glew)
    515         cd $(glew); $(runtime)/$(glew)/configure $(glew_flags)
    516 endef
    517 define build_glew
    518         $(MAKE)  -C $(glew) all
    519 endef
    520 define install_glew
    521         $(MAKE) -C $(glew) install
    522 endef
    523 define touch_glew
    524         touch $(glew)/timestamp
    525 endef
    526 
    527 $(glew)/timestamp:
    528         + $(clean_glew)
    529         + $(fetch_glew)
    530         + $(configure_glew)
    531         + $(build_glew)
    532         + $(install_glew)
    533         + $(touch_glew)
    534467
    535468# -------------------------------------------------------------------------
     
    695628endef
    696629define fetch_itcl
    697         sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(itcl)
     630        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(itcl)
    698631endef
    699632define configure_itcl
     
    893826
    894827# -------------------------------------------------------------------------
    895 #  NANOSCALE
    896 # -------------------------------------------------------------------------
    897 
    898 nanoscale_flags =       \
    899         --with-statsdir=$(statsdir) \
    900         $(common_flags)
    901 
    902 nanoscale: $(nanoscale)/timestamp
    903 
    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)/timestamp
    917         + $(clean_nanoscale)
    918         + $(fetch_nanoscale)
    919         + $(configure_nanoscale)
    920         + $(build_nanoscale)
    921         + $(install_nanoscale)
    922         + $(touch_nanoscale)
    923 
    924 define clean_nanoscale
    925         $(RM) -r $(nanoscale)
    926 endef
    927 define fetch_nanoscale
    928 endef
    929 define configure_nanoscale
    930         $(MKDIR_P) $(nanoscale)
    931         cd $(nanoscale); $(srcdir)/packages/vizservers/$(nanoscale)/configure $(nanoscale_flags)
    932 endef
    933 define build_nanoscale
    934         $(MAKE) -C $(nanoscale) all
    935 endef
    936 define install_nanoscale
    937         $(MAKE) -C $(nanoscale) install
    938 endef
    939 define touch_nanoscale
    940         touch $(nanoscale)/timestamp
    941 endef
    942 
    943 $(nanoscale)/timestamp: $(pymol)/timestamp
    944         + $(clean_nanoscale)
    945         + $(fetch_nanoscale)
    946         + $(configure_nanoscale)
    947         + $(build_nanoscale)
    948         + $(install_nanoscale)
    949         + $(touch_nanoscale)
    950 
    951 
    952 # -------------------------------------------------------------------------
    953 #  NANOVIS
    954 # -------------------------------------------------------------------------
    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)/timestamp
    966 
    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)/timestamp
    980         + $(clean_nanovis)
    981         + $(fetch_nanovis)
    982         + $(configure_nanovis)
    983         + $(build_nanovis)
    984         + $(install_nanovis)
    985         + $(touch_nanovis)
    986 
    987 define clean_nanovis
    988         $(RM) -r $(nanovis)
    989 endef
    990 define fetch_nanovis
    991 endef
    992 define configure_nanovis
    993         $(MKDIR_P) $(nanovis)
    994         cd $(nanovis); $(srcdir)/packages/vizservers/$(nanovis)/configure $(nanovis_flags)
    995 endef
    996 define build_nanovis
    997         $(MAKE) -C $(nanovis) all
    998 endef
    999 define install_nanovis
    1000         $(MAKE) -C $(nanovis) install
    1001 endef
    1002 define touch_nanovis
    1003         touch $(nanovis)/timestamp
    1004 endef
    1005 
    1006 $(nanovis)/timestamp: $(librappture)/timestamp $(vtk)/timestamp
    1007         + $(clean_nanovis)
    1008         + $(fetch_nanovis)
    1009         + $(configure_nanovis)
    1010         + $(build_nanovis)
    1011         + $(install_nanovis)
    1012         + $(touch_nanovis)
    1013 
    1014 # -------------------------------------------------------------------------
    1015828#  OPTIMIZER
    1016829# -------------------------------------------------------------------------
     
    1071884
    1072885# -------------------------------------------------------------------------
    1073 #  OSG
    1074 # -------------------------------------------------------------------------
    1075 
    1076 osg_flags =     \
    1077         --with-tclsh="$(bindir)/tclsh8.4" \
    1078         --enable-shared \
    1079         $(common_flags)
    1080 
    1081 osg: $(osg)/timestamp
    1082 
    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)/timestamp
    1096         + $(clean_osg)
    1097         + $(fetch_osg)
    1098         + $(configure_osg)
    1099         + $(build_osg)
    1100         + $(install_osg)
    1101         + $(touch_osg)
    1102 
    1103 define clean_osg
    1104         $(RM) -r $(osg)
    1105 endef
    1106 define fetch_osg
    1107         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osg)
    1108 endef
    1109 define configure_osg
    1110         $(MKDIR_P) $(osg)
    1111         cd $(osg); $(runtime)/$(osg)/configure $(osg_flags)
    1112 endef
    1113 define build_osg
    1114         $(MAKE) -C $(osg) all
    1115 endef
    1116 define install_osg
    1117         $(MAKE) -C $(osg) install
    1118 endef
    1119 define touch_osg
    1120         touch $(osg)/timestamp
    1121 endef
    1122 
    1123 $(osg)/timestamp:
    1124         + $(clean_osg)
    1125         + $(fetch_osg)
    1126         + $(configure_osg)
    1127         + $(build_osg)
    1128         + $(install_osg)
    1129         + $(touch_osg)
    1130 
    1131 # -------------------------------------------------------------------------
    1132 #  OSGEARTH
    1133 # -------------------------------------------------------------------------
    1134 
    1135 osgearth_flags =        \
    1136         --with-tclsh="$(bindir)/tclsh8.4" \
    1137         --enable-shared \
    1138         $(common_flags)
    1139 
    1140 osgearth: $(osgearth)/timestamp
    1141 
    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)/timestamp
    1155         + $(clean_osgearth)
    1156         + $(fetch_osgearth)
    1157         + $(configure_osgearth)
    1158         + $(build_osgearth)
    1159         + $(install_osgearth)
    1160         + $(touch_osgearth)
    1161 
    1162 define clean_osgearth
    1163         $(RM) -r $(osgearth)
    1164 endef
    1165 define fetch_osgearth
    1166         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osgearth)
    1167 endef
    1168 define configure_osgearth
    1169         $(MKDIR_P) $(osgearth)
    1170         cd $(osgearth); $(runtime)/$(osgearth)/configure $(osgearth_flags)
    1171 endef
    1172 define build_osgearth
    1173         $(MAKE) -C $(osgearth) all
    1174 endef
    1175 define install_osgearth
    1176         $(MAKE) -C $(osgearth) install
    1177 endef
    1178 define touch_osgearth
    1179         touch $(osgearth)/timestamp
    1180 endef
    1181 
    1182 $(osgearth)/timestamp: $(osg)/timestamp
    1183         + $(clean_osgearth)
    1184         + $(fetch_osgearth)
    1185         + $(configure_osgearth)
    1186         + $(build_osgearth)
    1187         + $(install_osgearth)
    1188         + $(touch_osgearth)
    1189 
    1190 # -------------------------------------------------------------------------
    1191 #  PYMOL
    1192 # -------------------------------------------------------------------------
    1193 
    1194 pymol_flags =   \
    1195         $(common_flags)
    1196 
    1197 pymol: $(pymol)/timestamp
    1198 
    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)/timestamp
    1212         + $(clean_pymol)
    1213         + $(fetch_pymol)
    1214         + $(configure_pymol)
    1215         + $(build_pymol)
    1216         + $(install_pymol)
    1217         + $(touch_pymol)
    1218 
    1219 define clean_pymol
    1220         $(RM) -r $(pymol)
    1221 endef
    1222 define fetch_pymol
    1223         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(pymol)
    1224 endef
    1225 define configure_pymol
    1226         $(MKDIR_P) $(pymol)
    1227         cd $(pymol); $(runtime)/$(pymol)/configure $(pymol_flags)
    1228 endef
    1229 define build_pymol
    1230         $(MAKE) -C $(pymol) all
    1231 endef
    1232 define install_pymol
    1233         $(MAKE) -C $(pymol) install
    1234 endef
    1235 define touch_pymol
    1236         touch $(pymol)/timestamp
    1237 endef
    1238 
    1239 $(pymol)/timestamp: $(glew)/timestamp
    1240         + $(clean_pymol)
    1241         + $(fetch_pymol)
    1242         + $(configure_pymol)
    1243         + $(build_pymol)
    1244         + $(install_pymol)
    1245         + $(touch_pymol)
    1246 
    1247 
    1248 # -------------------------------------------------------------------------
    1249 #  PYMOLPROXY
    1250 # -------------------------------------------------------------------------
    1251 
    1252 pymolproxy_flags =      \
    1253         --with-tcllib=$(libdir) \
    1254         --with-statsdir=$(statsdir) \
    1255         $(common_flags)
    1256 
    1257 pymolproxy: $(pymolproxy)/timestamp
    1258 
    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)/timestamp
    1272         + $(clean_pymolproxy)
    1273         + $(fetch_pymolproxy)
    1274         + $(configure_pymolproxy)
    1275         + $(build_pymolproxy)
    1276         + $(install_pymolproxy)
    1277         + $(touch_pymolproxy)
    1278 
    1279 define clean_pymolproxy
    1280         $(RM) -r $(pymolproxy)
    1281 endef
    1282 define fetch_pymolproxy
    1283 endef
    1284 define configure_pymolproxy
    1285         $(MKDIR_P) $(pymolproxy)
    1286         cd $(pymolproxy); $(srcdir)/packages/vizservers/$(pymolproxy)/configure $(pymolproxy_flags)
    1287 endef
    1288 define build_pymolproxy
    1289         $(MAKE) -C $(pymolproxy) all
    1290 endef
    1291 define install_pymolproxy
    1292         $(MAKE) -C $(pymolproxy) install
    1293 endef
    1294 define touch_pymolproxy
    1295         touch $(pymolproxy)/timestamp
    1296 endef
    1297 
    1298 $(pymolproxy)/timestamp: $(pymol)/timestamp
    1299         + $(clean_pymolproxy)
    1300         + $(fetch_pymolproxy)
    1301         + $(configure_pymolproxy)
    1302         + $(build_pymolproxy)
    1303         + $(install_pymolproxy)
    1304         + $(touch_pymolproxy)
    1305 
    1306 # -------------------------------------------------------------------------
    1307886#  SHAPE
    1308887# -------------------------------------------------------------------------
     
    1398977endef
    1399978define fetch_sqlitetcl
    1400         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sqllitetcl)
     979        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sqlitetcl)
    1401980endef
    1402981define configure_sqlitetcl
    1403982        $(MKDIR_P) $(sqlitetcl)
    1404         cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/configure $(sqlitetcl_flags)
     983        cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/autoconf/tea/configure $(sqlitetcl_flags)
    1405984endef
    1406985define build_sqlitetcl
     
    14541033
    14551034define fetch_tcl
    1456         sh $(srcdir)/fetch.sh trunk $(srcdir) $(tcl)
     1035        sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(tcl)
    14571036endef
    14581037define clean_tcl
     
    16371216endef
    16381217define configure_tester
    1639         $(MKDIR_P) $(tester)
    16401218endef
    16411219define build_tester
     
    18331411
    18341412# -------------------------------------------------------------------------
    1835 #  VIDEO
    1836 # -------------------------------------------------------------------------
    1837 
    1838 video_flags =   \
    1839         --with-tclsh="$(bindir)/tclsh8.4" \
    1840         --enable-shared \
    1841         $(common_flags)
    1842 
    1843 video: $(video)/timestamp
    1844 
    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)/timestamp
    1858         + $(clean_video)
    1859         + $(fetch_video)
    1860         + $(configure_video)
    1861         + $(build_video)
    1862         + $(install_video)
    1863         + $(touch_video)
    1864 
    1865 define clean_video
    1866         $(RM) -r $(video)
    1867 endef
    1868 define fetch_video
    1869 endef
    1870 define configure_video
    1871         $(MKDIR_P) $(video)
    1872         cd $(video); $(srcdir)/$(video)/configure $(video_flags)
    1873 endef
    1874 define build_video
    1875         $(MAKE) -C $(video) all
    1876 endef
    1877 define install_video
    1878         $(MAKE) -C $(video) install
    1879 endef
    1880 define touch_video
    1881         touch $(video)/timestamp
    1882 endef
    1883 
    1884 $(video)/timestamp: $(gui)/timestamp
    1885         + $(clean_video)
    1886         + $(fetch_video)
    1887         + $(configure_video)
    1888         + $(build_video)
    1889         + $(install_video)
    1890         + $(touch_video)
    1891 
    1892 
    1893 # -------------------------------------------------------------------------
    1894 #  VORONOI
    1895 # -------------------------------------------------------------------------
    1896 
    1897 voronoi_flags = \
    1898         --enable-shared \
    1899         $(common_flags)
    1900 
    1901 voronoi: $(voronoi)/timestamp
    1902 
    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_voronoi
    1924         $(RM) -r $(voronoi)
    1925 endef
    1926 define fetch_voronoi
    1927         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(voronoi)
    1928 endef
    1929 define configure_voronoi
    1930         $(MKDIR_P) $(voronoi)
    1931         cd $(voronoi); $(runtime)/$(voronoi)/configure $(voronoi_flags)
    1932 endef
    1933 define build_voronoi
    1934         $(MAKE)  -C $(voronoi) all
    1935 endef
    1936 define install_voronoi
    1937         $(MAKE) -C $(voronoi) install
    1938 endef
    1939 define touch_voronoi
    1940         touch $(voronoi)/timestamp
    1941 endef
    1942 
    1943 $(voronoi)/timestamp:
    1944         + $(clean_voronoi)
    1945         + $(fetch_voronoi)
    1946         + $(configure_voronoi)
    1947         + $(build_voronoi)
    1948         + $(install_voronoi)
    1949         + $(touch_voronoi)
    1950 
    1951 # -------------------------------------------------------------------------
    19521413#  VTK
    19531414# -------------------------------------------------------------------------
     
    19701431touch-vtk:
    19711432        $(touch_vtk)
    1972 force-vtk: $(cmake)/timestamp $(glew)/timestamp $(tk)/timestamp
     1433force-vtk: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp
    19731434        + $(clean_vtk)
    19741435        + $(fetch_vtk)
     
    19821443endef
    19831444define fetch_vtk
    1984         sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(vtk)
     1445        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(vtk)
    19851446endef
    19861447define configure_vtk
     
    19981459endef
    19991460
    2000 $(vtk)/timestamp: $(cmake)/timestamp $(glew)/timestamp $(tk)/timestamp
     1461$(vtk)/timestamp: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp
    20011462        + $(clean_vtk)
    20021463        + $(fetch_vtk)
     
    20051466        + $(install_vtk)
    20061467        + $(touch_vtk)
    2007 
    2008 # -------------------------------------------------------------------------
    2009 #  VTKVIS
    2010 # -------------------------------------------------------------------------
    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)/timestamp
    2022 
    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)/timestamp
    2036         + $(clean_vtkvis)
    2037         + $(fetch_vtkvis)
    2038         + $(configure_vtkvis)
    2039         + $(build_vtkvis)
    2040         + $(install_vtkvis)
    2041         + $(touch_vtkvis)
    2042 
    2043 define clean_vtkvis
    2044         $(RM) -r $(vtkvis)
    2045 endef
    2046 define fetch_vtkvis
    2047 endef
    2048 define configure_vtkvis
    2049         $(MKDIR_P) $(vtkvis)
    2050         cd $(vtkvis); $(srcdir)/packages/vizservers/$(vtkvis)/configure $(vtkvis_flags)
    2051 endef
    2052 define build_vtkvis
    2053         $(MAKE) -C $(vtkvis) all
    2054 endef
    2055 define install_vtkvis
    2056         $(MAKE) -C $(vtkvis) install
    2057 endef
    2058 define touch_vtkvis
    2059         touch $(vtkvis)/timestamp
    2060 endef
    2061 
    2062 $(vtkvis)/timestamp: $(vtk)/timestamp
    2063         + $(clean_vtkvis)
    2064         + $(fetch_vtkvis)
    2065         + $(configure_vtkvis)
    2066         + $(build_vtkvis)
    2067         + $(install_vtkvis)
    2068         + $(touch_vtkvis)
    2069 
    2070 # -------------------------------------------------------------------------
    2071 #  GEOVIS
    2072 # -------------------------------------------------------------------------
    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)/timestamp
    2084 
    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)/timestamp
    2098         + $(clean_geovis)
    2099         + $(fetch_geovis)
    2100         + $(configure_geovis)
    2101         + $(build_geovis)
    2102         + $(install_geovis)
    2103         + $(touch_geovis)
    2104 
    2105 define clean_geovis
    2106         $(RM) -r $(geovis)
    2107 endef
    2108 define fetch_geovis
    2109 endef
    2110 define configure_geovis
    2111         $(MKDIR_P) $(geovis)
    2112         cd $(geovis); $(srcdir)/packages/vizservers/$(geovis)/configure $(geovis_flags)
    2113 endef
    2114 define build_geovis
    2115         $(MAKE) -C $(geovis) all
    2116 endef
    2117 define install_geovis
    2118         $(MAKE) -C $(geovis) install
    2119 endef
    2120 define touch_geovis
    2121         touch $(geovis)/timestamp
    2122 endef
    2123 
    2124 $(geovis)/timestamp: $(osgearth)/timestamp
    2125         + $(clean_geovis)
    2126         + $(fetch_geovis)
    2127         + $(configure_geovis)
    2128         + $(build_geovis)
    2129         + $(install_geovis)
    2130         + $(touch_geovis)
    21311468
    21321469# -------------------------------------------------------------------------
  • branches/r9/configure

    r4840 r4852  
    622622#endif"
    623623
    624 enable_option_checking=no
    625624ac_subst_vars='LTLIBOBJS
    626625LIBOBJS
    627 subdirs
    628626WORDSIZE
    629627X_LIBRARIES
     
    860858XMKMF
    861859CXXCPP'
    862 ac_subdirs_all='packages/optimizer/src '
     860
    863861
    864862# Initialize some variables set by options.
     
    1032010318
    1032110319
    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"
     10320ac_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"
    1032910321
    1033010322cat >confcache <<\_ACEOF
     
    1102211014    "src/core/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/core/config.h" ;;
    1102311015    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    11024     "packages/Makefile") CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
    1102511016    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    1102611017    "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;;
     
    1104211033    "gui/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES gui/pkgIndex.tcl" ;;
    1104311034    "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;;
    11044     "gui/src/Makefile") CONFIG_FILES="$CONFIG_FILES gui/src/Makefile" ;;
    1104511035    "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;;
    1104611036    "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;;
     
    1114611136    "examples/zoo/structure/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/structure/examples/Makefile" ;;
    1114711137    "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" ;;
    1115011159    "oldtest/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/Makefile" ;;
    1115111160    "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;;
     
    1173711746  $ac_cs_success || as_fn_exit 1
    1173811747fi
    11739 
    11740 #
    11741 # CONFIG_SUBDIRS section.
    11742 #
    11743 if test "$no_recursion" != yes; then
    11744 
    11745   # Remove --cache-file, --srcdir, and --disable-option-checking arguments
    11746   # so they do not pile up.
    11747   ac_sub_configure_args=
    11748   ac_prev=
    11749   eval "set x $ac_configure_args"
    11750   shift
    11751   for ac_arg
    11752   do
    11753     if test -n "$ac_prev"; then
    11754       ac_prev=
    11755       continue
    11756     fi
    11757     case $ac_arg in
    11758     -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 in
    11779       *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
    11780       esac
    11781       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
    11782     esac
    11783   done
    11784 
    11785   # Always prepend --prefix to ensure using the same prefix
    11786   # in subdir configurations.
    11787   ac_arg="--prefix=$prefix"
    11788   case $ac_arg in
    11789   *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
    11790   esac
    11791   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
    11792 
    11793   # Pass --silent
    11794   if test "$silent" = yes; then
    11795     ac_sub_configure_args="--silent $ac_sub_configure_args"
    11796   fi
    11797 
    11798   # Always prepend --disable-option-checking to silence warnings, since
    11799   # 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: && continue
    11804 
    11805     # Do not complain, so a configure script can configure whichever
    11806     # parts of a large source tree are present.
    11807     test -d "$srcdir/$ac_dir" || continue
    11808 
    11809     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
    11810     $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
    11811     $as_echo "$ac_msg" >&6
    11812     as_dir="$ac_dir"; as_fn_mkdir_p
    11813     ac_builddir=.
    11814 
    11815 case "$ac_dir" in
    11816 .) 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 in
    11822   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    11823   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
    11824   esac ;;
    11825 esac
    11826 ac_abs_top_builddir=$ac_pwd
    11827 ac_abs_builddir=$ac_pwd$ac_dir_suffix
    11828 # for backward compatibility:
    11829 ac_top_builddir=$ac_top_build_prefix
    11830 
    11831 case $srcdir in
    11832   .)  # We are building in place.
    11833     ac_srcdir=.
    11834     ac_top_srcdir=$ac_top_builddir_sub
    11835     ac_abs_top_srcdir=$ac_pwd ;;
    11836   [\\/]* | ?:[\\/]* )  # Absolute name.
    11837     ac_srcdir=$srcdir$ac_dir_suffix;
    11838     ac_top_srcdir=$srcdir
    11839     ac_abs_top_srcdir=$srcdir ;;
    11840   *) # Relative name.
    11841     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
    11842     ac_top_srcdir=$ac_top_build_prefix$srcdir
    11843     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
    11844 esac
    11845 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
    11846 
    11847 
    11848     cd "$ac_dir"
    11849 
    11850     # Check for guested configure; otherwise get Cygnus style configure.
    11851     if test -f "$ac_srcdir/configure.gnu"; then
    11852       ac_sub_configure=$ac_srcdir/configure.gnu
    11853     elif test -f "$ac_srcdir/configure"; then
    11854       ac_sub_configure=$ac_srcdir/configure
    11855     elif test -f "$ac_srcdir/configure.in"; then
    11856       # This should be Cygnus configure.
    11857       ac_sub_configure=$ac_aux_dir/configure
    11858     else
    11859       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
    11860 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
    11861       ac_sub_configure=
    11862     fi
    11863 
    11864     # The recursion is here.
    11865     if test -n "$ac_sub_configure"; then
    11866       # Make the cache file name correct relative to the subdirectory.
    11867       case $cache_file in
    11868       [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
    11869       *) # Relative name.
    11870         ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
    11871       esac
    11872 
    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" >&5
    11874 $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" 5
    11879     fi
    11880 
    11881     cd "$ac_popdir"
    11882   done
    11883 fi
    1188411748if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
    1188511749  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  • branches/r9/configure.in

    r4840 r4852  
    453453AC_SUBST(WORDSIZE)
    454454
    455 ac_configure_args="--disable-threads --enable-shared"
    456 AC_CONFIG_SUBDIRS( [packages/optimizer/src] )
    457 
    458455dnl read Makefile.in and write Makefile
    459456AC_CONFIG_FILES([
    460457    Makefile
    461     packages/Makefile
    462458    src/Makefile
    463459    src/core/Makefile
     
    479475    gui/pkgIndex.tcl
    480476    gui/scripts/Makefile
    481     gui/src/Makefile
    482477    builder/Makefile
    483478    builder/pkgIndex.tcl
     
    583578    examples/zoo/structure/examples/Makefile
    584579    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
    587601    oldtest/Makefile
    588602    oldtest/src/Makefile
  • branches/r9/fetch.sh

    r4840 r4852  
    1010url="https://nanohub.org/infrastructure"
    1111if test -d "$destdir/$pkgdir" ; then
     12  echo svn update $destdir/$pkgdir
    1213  svn update $destdir/$pkgdir
    1314else
     15  echo svn co -q $url/rappture-runtime/svn/$path/$pkgdir $destdir/$pkgdir
    1416  svn co -q $url/rappture-runtime/svn/$path/$pkgdir $destdir/$pkgdir
    1517fi
  • branches/r9/gui/Makefile.in

    r3471 r4852  
    2626                pkgIndex.tcl
    2727
    28 SUBDIRS         = src scripts apps
     28SUBDIRS         = scripts apps
    2929
    3030.PHONY: all install test clean distclean $(SUBDIRS)
  • branches/r9/lang/tcl/src/Makefile.in

    r4146 r4852  
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
    31 HAVE_NCURSES    = @HAVE_LIBNCURSES@
    3230
    3331CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    5351LIBS = \
    5452        -L../../../src/core -lrappture \
    55         $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++
     53        $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++
    5654
    5755OBJS = \
    5856        Rappture_Init.o \
    59         RpCurses.o \
    60         RpDaemon.o \
    6157        RpEncodeTclInterface.o \
    62         RpOp.o \
    63         RpRlimit.o  \
    64         RpRusage.o \
    65         RpSignal.o  \
    66         RpSlice.o  \
    67         RpSysinfo.o  \
    68         Switch.o \
    6958        RpUnitsTclInterface.o \
    7059        RpUtilsTclInterface.o
    71 
    72 ifeq ($(WIN32),"")
    73    OBJS += RpWinResource.o
    74 endif
    75 
    76 ifeq ($(HAVE_LIBCURSES),yes)
    77    OBJS += RpCurses.o
    78    LIBS += -lncurses
    79 endif
    8060
    8161# Not using     RpLibraryTclInterface.o \
  • branches/r9/lang/tcl/src/Rappture_Init.c

    r3736 r4852  
    6767        return TCL_ERROR;
    6868    }
    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     }
    9069    return TCL_OK;
    9170}
  • branches/r9/packages/DicomToVtk/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    3537INCLUDES =      \
    3638                -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)
    4141
    4242LIBS =          \
    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) \
    4645
    4746version =       @PACKAGE_VERSION@
     
    5756
    5857OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     58                RpDicomToVtk.o
    6259
    63 name        = RapptureVideo$(version)
    64 libname     = $(name)
    65 lib         = $(libname)$(SHLIB_SUFFIX)
    66 destdir     = $(libdir)/$(name)
     60name            = RapptureDicomToVtk$(version)
     61libname         = $(name)
     62lib             = $(libname)$(SHLIB_SUFFIX)
     63destdir         = $(libdir)/$(name)
    6764
    6865.PHONY: all install clean distclean
  • branches/r9/packages/DxToVtk/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    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) \
    4647
    4748version =       @PACKAGE_VERSION@
     
    5758
    5859OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     60                RpDxToVtk.o
    6261
    63 name        = RapptureVideo$(version)
     62name        = RapptureDxToVtk$(version)
    6463libname     = $(name)
    6564lib         = $(libname)$(SHLIB_SUFFIX)
     
    7978        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8079
    81 .cc.o:
     80.cpp.o:
    8281        $(CXX) $(CXX_SWITCHES) -c $?
    8382.c.o:
  • branches/r9/packages/Makefile.in

    r4844 r4852  
    1414RM              = rm -f
    1515VPATH           = $(srcdir)
     16HAVE_VTK        = @HAVE_VTK@
    1617
    17 subdirs =       \
     18SUBDIRS         = \
     19                diffview \
    1820                hotspot \
     21                listbox \
    1922                placard \
    20                 DicomToVtk \
    21                 DiffView \
    22                 DxToVtk \
    23                 listbox \
    24                 PdbToVtk \
    25                 ReadPoints \
     23                readpoints \
    2624                squeezer \
    27                 system \
    28                 optimizer \
    29                 video
     25                system
     26
     27ifeq ($(HAVE_VTK),yes)
     28   SUBDIRS += DicomToVtk DxToVtk PdbToVtk
     29endif
     30
     31.PHONY: all install test clean distclean $(SUBDIRS)
    3032
    3133all:
     34        for i in $(SUBDIRS) ; do \
     35          $(MAKE) -C $$i all || exit 1 ;\
     36        done
    3237
    33 optimizer:
    34         $(MAKE) -C optimizer/src all
    3538install:
    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
    3747
    3848clean:
    39         $(MAKE) -C optimizer/src clean
     49        for i in $(SUBDIRS) ; do \
     50          $(MAKE) -C $$i clean ;\
     51        done
    4052
    4153distclean:
    42         $(MAKE) -C optimizer/src distclean
    43         $(RM) Makefile *~
     54        for i in $(SUBDIRS) ; do \
     55          $(MAKE) -C $$i distclean ;\
     56        done
    4457
  • branches/r9/packages/PdbToVtk/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    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) \
    4647
    4748version =       @PACKAGE_VERSION@
     
    5758
    5859OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     60                pdbToVtk.o
    6261
    63 name        = RapptureVideo$(version)
     62name        = RappturePdbToVtk$(version)
    6463libname     = $(name)
    6564lib         = $(libname)$(SHLIB_SUFFIX)
     
    7978        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8079
    81 .cc.o:
     80.cpp.o:
    8281        $(CXX) $(CXX_SWITCHES) -c $?
    8382.c.o:
  • branches/r9/packages/diffview/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    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) \
    4647
    4748version =       @PACKAGE_VERSION@
     
    5758
    5859OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     60                diffview.o
    6261
    63 name        = RapptureVideo$(version)
     62name        = RapptureDiffView$(version)
    6463libname     = $(name)
    6564lib         = $(libname)$(SHLIB_SUFFIX)
     
    7978        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8079
    81 .cc.o:
     80.cpp.o:
    8281        $(CXX) $(CXX_SWITCHES) -c $?
    8382.c.o:
  • branches/r9/packages/diffview/diffview.c

    r4851 r4852  
    414414};
    415415
    416 /*
    417  * ------------------------------------------------------------------------
    418  *  RpDiffview_Init --
    419  *
    420  *  Invoked when the Rappture GUI library is being initialized
    421  *  to install the "diffview" widget into the interpreter.
    422  *
    423  *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
    424  *  message in the interp) if anything goes wrong.
    425  * ------------------------------------------------------------------------
    426  */
    427 int
    428 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 }
    444416
    445417/*
     
    27962768    }
    27972769}
     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 */
     2782int
     2783RapptureDiffview_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  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    43                 -L../src/core -lrappture \
    44                 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \
     45                $(TCL_LIB_SPEC) \
     46                $(TK_LIB_SPEC) \
    4547
    4648version =       @PACKAGE_VERSION@
     
    5658
    5759OBJS =          \
    58                 canvHotspot.o
     60                hotspot.o
    5961
    6062name        = RapptureCanvasHotspot$(version)
  • branches/r9/packages/hotspot/hotspot.c

    r4844 r4852  
    18271827/*
    18281828 * ------------------------------------------------------------------------
    1829  *  RpCanvHotspot_Init --
     1829 *  RapptureCanvasHotspot_Init --
    18301830 *
    18311831 *  Invoked when the Rappture GUI library is being initialized
     
    18371837 */
    18381838int
    1839 RpCanvHotspot_Init(interp)
     1839RapptureCanvasHotspot_Init(interp)
    18401840    Tcl_Interp *interp;         /* interpreter being initialized */
    18411841{
  • branches/r9/packages/listbox/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    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) \
    4647
    4748version =       @PACKAGE_VERSION@
     
    5758
    5859OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     60                RpListbox.o
    6261
    63 name        = RapptureVideo$(version)
     62name        = RapptureListbox$(version)
    6463libname     = $(name)
    6564lib         = $(libname)$(SHLIB_SUFFIX)
     
    7978        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8079
    81 .cc.o:
     80.cpp.o:
    8281        $(CXX) $(CXX_SWITCHES) -c $?
    8382.c.o:
  • branches/r9/packages/listbox/RpListbox.c

    r4841 r4852  
    3333 * RCS: @(#) $Id: tkListbox.c,v 1.29.2.5 2007/04/29 02:24:02 das Exp $
    3434 */
    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
    41100#endif
    42101
     
    821880             */
    822881            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) {
    824885                    sprintf(indexStringRep, "%d", i);
    825886                    Tcl_AppendElement(interp, indexStringRep);
     
    13611422        }
    13621423        case SELECTION_INCLUDES: {
     1424            long key = first;
    13631425            if (objc != 4) {
    13641426                Tcl_WrongNumArgs(interp, 3, objv, "index");
     
    13671429            Tcl_SetObjResult(interp,
    13681430                    Tcl_NewBooleanObj((Tcl_FindHashEntry(listPtr->selection,
    1369                             (char *)first) != NULL)));
     1431                            (char *)key) != NULL)));
    13701432            result = TCL_OK;
    13711433            break;
     
    15591621    Tcl_HashEntry *entry;
    15601622    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);
    15631626    if (new) {
    15641627        attrs = (ItemAttr *) ckalloc(sizeof(ItemAttr));
     
    20652128         */
    20662129        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) {
    20682132                /* Selected items are drawn differently. */
    20692133                gc = listPtr->selTextGC;
     
    22402304            listPtr->borderWidth, listPtr->relief);
    22412305    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.  */
    22442310        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);
    22532313    }
    22542314#ifndef TK_NO_DOUBLE_BUFFERING
     
    27432803     */
    27442804    for (i = first; i <= last; i++) {
     2805        long key = i;
    27452806        /* Remove selection information */
    2746         entry = Tcl_FindHashEntry(listPtr->selection, (char *)i);
     2807        entry = Tcl_FindHashEntry(listPtr->selection, (char *)key);
    27472808        if (entry != NULL) {
    27482809            listPtr->numSelected--;
     
    27502811        }
    27512812
    2752         entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)i);
     2813        entry = Tcl_FindHashEntry(listPtr->itemAttrTable, (char *)key);
    27532814        if (entry != NULL) {
    27542815            ckfree((char *)Tcl_GetHashValue(entry));
     
    34173478     */
    34183479    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);
    34203482        if (entry != NULL) {
    34213483            if (!select) {
     
    34293491            if (select) {
    34303492                entry = Tcl_CreateHashEntry(listPtr->selection,
    3431                         (char *)i, &new);
     3493                        (char *)key, &new);
    34323494                Tcl_SetHashValue(entry, (ClientData) NULL);
    34333495                listPtr->numSelected++;
     
    35053567    Tcl_DStringInit(&selection);
    35063568    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);
    35083571        if (entry != NULL) {
    35093572            if (needNewline) {
     
    37873850    if (offset > 0) {
    37883851        for (i = last; i >= first; i--) {
    3789             entry = Tcl_FindHashEntry(table, (char *)i);
     3852            long key = i;
     3853            entry = Tcl_FindHashEntry(table, (char *)key);
    37903854            if (entry != NULL) {
    37913855                clientData = Tcl_GetHashValue(entry);
    37923856                Tcl_DeleteHashEntry(entry);
    3793                 entry = Tcl_CreateHashEntry(table, (char *)(i + offset), &new);
     3857                entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new);
    37943858                Tcl_SetHashValue(entry, clientData);
    37953859            }
     
    37973861    } else {
    37983862        for (i = first; i <= last; i++) {
    3799             entry = Tcl_FindHashEntry(table, (char *)i);
     3863            long key = i;
     3864            entry = Tcl_FindHashEntry(table, (char *)key);
    38003865            if (entry != NULL) {
    38013866                clientData = Tcl_GetHashValue(entry);
    38023867                Tcl_DeleteHashEntry(entry);
    3803                 entry = Tcl_CreateHashEntry(table, (char *)(i + offset), &new);
     3868                entry = Tcl_CreateHashEntry(table, (char *)(key+offset), &new);
    38043869                Tcl_SetHashValue(entry, clientData);
    38053870            }
  • branches/r9/packages/placard/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    43                 -L../src/core -lrappture \
    44                 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ \
    45 
     45                $(TCL_LIB_SPEC) \
     46                $(TK_LIB_SPEC) \
     47M
    4648version =       @PACKAGE_VERSION@
    4749DEFINES =       -DPACKAGE_VERSION=\"$(version)\"
     
    5557
    5658
    57 OBJS =          canvPlacard.o
     59OBJS =          \
     60                canvPlacard.o
    5861
    5962name        = RapptureCanvasPlacard$(version)
     
    7578        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    7679
    77 .cc.o:
     80.cpp.o:
    7881        $(CXX) $(CXX_SWITCHES) -c $?
    7982.c.o:
  • branches/r9/packages/placard/canvPlacard.c

    r4842 r4852  
    413413
    414414
    415 /*
    416  * ------------------------------------------------------------------------
    417  *  RpCanvPlacard_Init --
    418  *
    419  *  Invoked when the Rappture GUI library is being initialized
    420  *  to install the "placard" item on the Tk canvas widget.
    421  *
    422  *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
    423  *  message in the interp) if anything goes wrong.
    424  * ------------------------------------------------------------------------
    425  */
    426 int
    427 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 }
    437415
    438416/*
     
    14591437    return;
    14601438}
     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 */
     1451int
     1452RapptureCanvasPlacard_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  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4143
    4244LIBS =          \
    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) \
    4647
    4748version =       @PACKAGE_VERSION@
     
    5758
    5859OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     60                readPoints.o
    6261
    63 name        = RapptureVideo$(version)
     62name        = RapptureReadPoints$(version)
    6463libname     = $(name)
    6564lib         = $(libname)$(SHLIB_SUFFIX)
     
    7978        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8079
    81 .cc.o:
     80.cpp.o:
    8281        $(CXX) $(CXX_SWITCHES) -c $?
    8382.c.o:
  • branches/r9/packages/readpoints/readPoints.c

    r4841 r4852  
    167167/*
    168168 * ------------------------------------------------------------------------
    169  *  RpReadPoints_Init --
     169 *  RapptureReadPoints_Init --
    170170 *
    171171 *  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.
    173173 *
    174174 *  Returns TCL_OK if successful, or TCL_ERROR (along with an error
     
    177177 */
    178178int
    179 RpReadPoints_Init(Tcl_Interp *interp)
     179RapptureReadPoints_Init(Tcl_Interp *interp)
    180180{
    181181    /* install the widget command */
    182     Tcl_CreateObjCommand(interp, "Rappture::ReadPoints", ReadPoints,
     182    Tcl_CreateObjCommand(interp, "Rappture::readpoints", ReadPoints,
    183183        NULL, NULL);
    184184    return TCL_OK;
  • branches/r9/packages/squeezer/Makefile.in

    r4843 r4852  
    2121SHLIB_LD        = @SHLIB_LD@
    2222SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    23 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     23SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2424SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    30 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     30TK_LIB_SPEC     = @TK_LIB_SPEC@
     31LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     32LIB_RUNTIME_DIR = $(libdir)
    3133
    3234CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    3537INCLUDES =      \
    3638                -I$(srcdir) \
    37                 -I../src/core \
    38                 -I$(srcdir)/../src/core \
    39                 -I$(srcdir)/../src/objects \
    4039                -I$(includedir)
    4140
    4241LIBS =          \
    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) \
    4644
    4745version =       @PACKAGE_VERSION@
     
    5755
    5856OBJS =          \
    59                 RpVideoTclInterface.o \
    60                 RpOp.o \
    61                 RpVideo.o
     57                RpSqueezer.o
    6258
    63 name        = RapptureVideo$(version)
    64 libname     = $(name)
    65 lib         = $(libname)$(SHLIB_SUFFIX)
    66 destdir     = $(libdir)/$(name)
     59name            = RapptureSqueezer$(version)
     60libname         = $(name)
     61lib             = $(libname)$(SHLIB_SUFFIX)
     62destdir         = $(libdir)/$(name)
    6763
    6864.PHONY: all install clean distclean
     
    7975        $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)
    8076
    81 .cc.o:
     77.cpp.o:
    8278        $(CXX) $(CXX_SWITCHES) -c $?
    8379.c.o:
  • branches/r9/packages/squeezer/RpSqueezer.c

    r4841 r4852  
    3030    Tcl_Interp *interp, int argc, CONST char **argv));
    3131
    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 error
    39  *  message in the interp) if anything goes wrong.
    40  * ------------------------------------------------------------------------
    41  */
    42 int
    43 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 }
    5232
    5333/*
     
    199179        }
    200180    }
     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
    201190    Tk_PhotoSetSize(destPhoto, destw, srch);
    202191    Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0,
    203192        destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET);
    204 
     193#endif
    205194    ckfree((char*)destBlock.pixelPtr);
    206195    return TCL_OK;
    207196}
     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 */
     208int
     209RapptureSqueezer_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.