Changeset 749


Ignore:
Timestamp:
May 28, 2007 11:45:31 AM (14 years ago)
Author:
dkearney
Message:

moved vizservers directory to top level. added configure/makefiles to nanovis, nanoscale, pymolproxy all controlled by a configure script in
vizservers directory. to build you need to specify where rappture and tcl are installed. the start_viz.sh script was adjusted to copy the voronoi and
rappture libraries over to the tmp directory because these files tend to reside on an nfs mounted drive.

Location:
trunk/vizservers
Files:
7 added
4 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/vizservers/nanoscale/Makefile

    r717 r749  
    1 CFLAGS  = -O2 -g
    2 LDFLAGS =
    3 TARGETS = client mycat nanoscale
    4 INSTALL_DIR     = /opt/nanoscale
     1TARGETS         = client mycat nanoscale
     2
     3CC              = gcc
     4CFLAGS          = -g -O2
     5LDFLAGS         =
     6
     7prefix          = /home/nanohub/dkearney/repo/viz_20070521
     8exec_prefix     = /home/nanohub/dkearney/repo/viz_20070521
     9bindir          = ${exec_prefix}/bin
     10libdir          = ${exec_prefix}/lib
     11includedir      = ${prefix}/include
     12mandir          = ${prefix}/man
     13
     14INSTALL         = /usr/bin/install -c
     15INSTALL_PROGRAM = ${INSTALL} -m 755
     16INSTALL_DATA    = ${INSTALL} -m 644
     17INSTALL_SCRIPT  = ${INSTALL} -m 644
     18
     19.PHONY: all install clean
    520
    621all: $(TARGETS)
    722
    823nanoscale: server.o
    9         cc $(CFLAGS) $(LDFLAGS) server.o -o nanoscale
     24        $(CC) $(CFLAGS) $(LDFLAGS) server.o -o nanoscale
    1025
    1126install: nanoscale
    12         cp nanoscale $(INSTALL_DIR)/bin
     27        $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
    1328
    1429client: client.o clientlib.o
  • trunk/vizservers/nanovis/Makefile

    r677 r749  
    1 OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
     1
     2SHELL = /bin/sh
     3
     4.SUFFIX:
     5.SUFFIX: .c .o .cpp
     6
     7.PHONY: all install clean distclean
     8
     9prefix          = /home/nanohub/dkearney/repo/viz_20070521
     10exec_prefix     = /home/nanohub/dkearney/repo/viz_20070521
     11bindir          = ${exec_prefix}/bin
     12libdir          = ${exec_prefix}/lib
     13includedir      = ${prefix}/include
     14mandir          = ${prefix}/man
     15
     16INSTALL                 = /usr/bin/install -c
     17INSTALL_PROGRAM = ${INSTALL} -m 755
     18INSTALL_DATA    = ${INSTALL} -m 644
     19INSTALL_SCRIPT  = ${INSTALL} -m 644
     20
     21CC = gcc
     22
     23AUXSRC = config.h define.h global.h
     24
     25R2INC = ./R2/include
     26
     27LIB_NANOVIS = -L/apps/rappture/render-dev/lib -ltcl8.4 -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lrappture2 -lb64 -lz
     28INCLUDES = -I/apps/rappture/render-dev/include -I/apps/rappture/render-dev/include/rappture2 -I/usr/include/GL -I$(R2INC) -I.
     29
     30CFLAGS = -g -O2 $(INCLUDES)
     31# $(CFLAGS)
     32
     33OBJS  = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
    234                Texture1D.o Texture3D.o Volume.o ZincBlendeVolume.o Texture2D.o ParticleSystem.o Sphere.o Color.o \
    335                PerfQuery.o TransferFunction.o ControlPoint.o ColorGradient.o ColorPaletteWindow.o\
     
    941                R2string.o R2FilePath.o R2Fonts.o R2Object.o
    1042
    11 OBJ_VOLUMERENDERER = Volume.o ConvexPolygon.o TransferFunction.o Mat4x4.o  Camera.o
    12 OBJ_PLANERENDERER = Texture2D.o TransferFunction.o
    13 OBJ_CLIENT = Socket.o ClientSocket.o RenderClient.o Event.o
    14 
    15 AUXSRC = config.h define.h global.h
    16 
    17 SOCKETSRC = ./socket
    18 SORTSRC = ./sort
    19 TFSRC = ./transfer-function
    20 NANOSCALESRC = ./nanoscale
    21 INSTALL_DIR = /opt/nanovis
    22 R2SRC = ./R2/src
    23 R2INC = ./R2/include
    24 
    25 RP2_LIBS = /apps/rappture/render-dev/lib/librappture2.a /apps/rappture/render-dev/lib/libb64.a /apps/rappture/render-dev/lib/libz.a
    26 LIB_NANOVIS = -Wl,-rpath,/apps/rappture/render-dev/lib -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread # -lstdc++
    27 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread # -lstdc++
    28 INCLUDES = -I/apps/rappture/render-dev/include/rappture2 -I/apps/rappture/render-dev/include -I/opt/render/include -I/usr/include/GL -I/usr/include/GL -I/usr/include/tcl8.4 -I/usr/include/GL -I$(R2INC)
    29 CFLAG = -g -c $(INCLUDES)
    30 
    3143all: nanovis
    3244
    3345install: nanovis
    34         cp nanovis $(INSTALL_DIR)/bin
     46        $(INSTALL_PROGRAM) nanovis $(bindir)/nanovis
     47        $(INSTALL_PROGRAM) /apps/rappture/render-dev/bin/voronoi $(bindir)/voronoi
     48        $(INSTALL_PROGRAM) -d $(libdir)/resources $(libdir)/shaders
     49        $(INSTALL_DATA) resources/* $(libdir)/resources
     50        $(INSTALL_DATA) shaders/* $(libdir)/shaders
     51        $(INSTALL_DATA) /apps/rappture/render-dev/lib/librappture2.so $(libdir)/librappture2.so
     52        $(INSTALL_DATA) /apps/rappture/render-dev/lib/libz.so $(libdir)/libz.so
     53        $(INSTALL_DATA) /apps/rappture/render-dev/lib/libb64.so $(libdir)/libb64.so
    3554
    3655clean:
    37         rm -f *.o nanovis client simclient
     56        rm -f *.o nanovis client
    3857
    39 nanovis: $(OBJ_NANOVIS)
    40         gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) $(RP2_LIBS)
     58nanovis: $(OBJS)
     59        $(CC) -g -o $@ $^ $(LIB_NANOVIS)
    4160
    42 ColorGradient.o: Color.o $(TFSRC)/ColorGradient.cpp
    43         gcc $(CFLAG) $(TFSRC)/ColorGradient.cpp
     61client: Socket.o ClientSocket.o RenderClient.o Event.o
     62        $(CC) -g -o $(LIB_NANOVIS) $@ $^
     63
     64.cpp.o:
     65        $(CC) $(CFLAGS) -o $@ -c $<
    4466
    4567Nv.o: Nv.cpp NvShader.cpp
    46         gcc $(CFLAG) Nv.cpp
     68        $(CC) $(CFLAGS) -c $^
     69
     70ColorGradient.o: transfer-function/ColorGradient.cpp
     71        $(CC) $(CFLAGS) -o $@ -c $<
     72ColorPaletteWindow.o: transfer-function/ColorPaletteWindow.cpp
     73        $(CC) $(CFLAGS) -o $@ -c $<
     74ColorGradientGLUTWindow.o: transfer-function/ColorGradientGLUTWindow.cpp
     75        $(CC) $(CFLAGS) -o $@ -c $<
     76ControlPoint.o: transfer-function/ControlPoint.cpp
     77        $(CC) $(CFLAGS) -o $@ -c $<
     78TransferFunctionGLUTWindow.o: transfer-function/TransferFunctionGLUTWindow.cpp
     79        $(CC) $(CFLAGS) -o $@ -c $<
     80MainWindow.o: transfer-function/MainWindow.cpp
     81        $(CC) $(CFLAGS) -o $@ -c $<
     82Socket.o: socket/Socket.cpp socket/Socket.h
     83        $(CC) $(CFLAGS) -o $@ -c $<
     84ClientSocket.o: socket/ClientSocket.cpp socket/ClientSocket.h
     85        $(CC) $(CFLAGS) -o $@ -c $<
     86RenderClient.o: socket/RenderClient.cpp socket/RenderClient.h
     87        $(CC) $(CFLAGS) -o $@ -c $<
     88R2string.o: R2/src/R2string.cpp $(R2INC)/R2/R2string.h
     89        $(CC) $(CFLAGS) -o $@ -c $<
     90R2FilePath.o: R2/src/R2FilePath.cpp $(R2INC)/R2/R2FilePath.h
     91        $(CC) $(CFLAGS) -o $@ -c $<
     92R2Fonts.o: R2/src/R2Fonts.cpp $(R2INC)/R2/R2Fonts.h
     93        $(CC) $(CFLAGS) -o $@ -c $<
     94R2Object.o: R2/src/R2Object.cpp $(R2INC)/R2/R2Object.h
     95        $(CC) $(CFLAGS) -o $@ -c $<
     96
     97
    4798
    4899NvStdVertexShader.o: NvStdVertexShader.cpp NvStdVertexShader.h
    49         gcc $(CFLAG) NvStdVertexShader.cpp
    50 
    51 NvLoadFile.o: NvLoadFile.cpp NvLoadFile.cpp
    52         gcc $(CFLAG) NvLoadFile.cpp
    53 
     100NvLoadFile.o: NvLoadFile.cpp NvLoadFile.h
    54101NvParticleAdvectionShader.o: NvParticleAdvectionShader.cpp NvParticleAdvectionShader.h
    55         gcc $(CFLAG) NvParticleAdvectionShader.cpp
    56 
    57102NvParticleRenderer.o: NvParticleRenderer.cpp NvParticleRenderer.h
    58         gcc $(CFLAG) NvParticleRenderer.cpp
    59 
    60103NvColorTableShader.o: NvColorTableShader.cpp NvColorTableShader.h
    61         gcc $(CFLAG) NvColorTableShader.cpp
    62 
    63104NvLIC.o: NvLIC.cpp NvLIC.h
    64         gcc $(CFLAG) NvLIC.cpp
    65 
    66105NvColorTableRenderer.o: NvColorTableRenderer.cpp NvColorTableRenderer.h
    67         gcc $(CFLAG) NvColorTableRenderer.cpp
    68 
    69106NvEventLog.o: NvEventLog.cpp NvEventLog.h
    70         gcc $(CFLAG) NvEventLog.cpp
    71 
    72107NvShader.o: NvShader.cpp NvShader.h
    73         gcc $(CFLAG) NvShader.cpp
    74 
    75108NvVolumeShader.o: NvVolumeShader.cpp NvVolumeShader.h
    76         gcc $(CFLAG) NvVolumeShader.cpp
    77 
    78109NvDefaultTFData.o: NvDefaultTFData.cpp
    79         gcc $(CFLAG) NvDefaultTFData.cpp
    80 
    81110NvRegularVolumeShader.o: NvRegularVolumeShader.cpp NvRegularVolumeShader.h
    82         gcc $(CFLAG) NvRegularVolumeShader.cpp
    83 
    84111NvZincBlendeVolumeShader.o: NvZincBlendeVolumeShader.cpp NvZincBlendeVolumeShader.h
    85         gcc $(CFLAG) NvZincBlendeVolumeShader.cpp
    86 
    87 ColorPaletteWindow.o: Color.o ControlPoint.o $(TFSRC)/ColorPaletteWindow.cpp
    88         gcc $(CFLAG) $(TFSRC)/ColorPaletteWindow.cpp
    89 
    90 ColorGradientGLUTWindow.o: ControlPoint.o ColorGradient.o $(TFSRC)/ColorGradientGLUTWindow.cpp
    91         gcc $(CFLAG) $(TFSRC)/ColorGradientGLUTWindow.cpp
    92 
    93 TransferFunctionGLUTWindow.o: ColorGradientGLUTWindow.o $(TFSRC)/TransferFunctionGLUTWindow.cpp
    94         gcc $(CFLAG) $(TFSRC)/TransferFunctionGLUTWindow.cpp
    95 
    96 MainWindow.o: TransferFunctionGLUTWindow.o ColorGradientGLUTWindow.o ColorPaletteWindow.o $(TFSRC)/MainWindow.cpp
    97         gcc $(CFLAG) $(TFSRC)/MainWindow.cpp
    98        
    99 Socket.o: $(SOCKETSRC)/Socket.h $(SOCKETSRC)/Socket.cpp
    100         gcc $(CFLAG) $(SOCKETSRC)/Socket.cpp
    101 
    102 ClientSocket.o: $(SOCKETSRC)/ClientSocket.h $(SOCKETSRC)/ClientSocket.cpp Socket.o
    103         gcc $(CFLAG) $(SOCKETSRC)/ClientSocket.cpp
    104 
    105 RenderClient.o: $(SOCKETSRC)/RenderClient.h $(SOCKETSRC)/RenderClient.cpp ClientSocket.o
    106         gcc $(CFLAG) $(SOCKETSRC)/RenderClient.cpp
    107 
    108 RenderVertexArray.o: RenderVertexArray.h RenderVertexArray.cpp
    109         gcc $(CFLAG) RenderVertexArray.cpp
    110 
    111 client: $(OBJ_CLIENT)
    112         gcc -g -o client $(OBJ_CLIENT) $(LIB_CLIENT)
    113 
    114 #simclient: Event.o $(NANOSCALESRC)/EventPlayer.cpp
    115 #       gcc -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o $(LIB_CLIENT)
    116 #       g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o
    117 
     112RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
    118113Color.o: Color.cpp Color.h
    119         gcc $(CFLAG) Color.cpp
    120 
    121114Event.o: Event.cpp Event.h
    122         gcc $(CFLAG) Event.cpp
    123 
    124 ControlPoint.o: $(TFSRC)/ControlPoint.cpp
    125         gcc $(CFLAG) $(TFSRC)/ControlPoint.cpp
    126 
    127 Sphere.o: Renderable.o Color.o Sphere.cpp Sphere.h
    128         gcc $(CFLAG) Sphere.cpp
    129 
     115Sphere.o: Sphere.cpp Sphere.h
    130116TransferFunction.o: TransferFunction.cpp
    131         gcc $(CFLAG) TransferFunction.cpp
    132 
    133117Texture1D.o: Texture1D.cpp Texture1D.h
    134         gcc $(CFLAG) Texture1D.cpp
    135 
    136118Texture2D.o: Texture2D.cpp Texture2D.h $(AUXSRC)
    137         gcc $(CFLAG) Texture2D.cpp
    138 
    139119Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC)
    140         gcc $(CFLAG) Texture3D.cpp
    141 
    142 ParticleSystem.o: Renderable.o ParticleSystem.cpp $(AUXSRC)
    143         gcc $(CFLAG) ParticleSystem.cpp
    144 
    145 Renderable.o: Vector3.o Renderable.cpp Renderable.h
    146         gcc $(CFLAG) Renderable.cpp
    147 
    148 Camera.o: Vector3.o Camera.cpp Camera.h
    149         gcc $(CFLAG) Camera.cpp
    150 
    151 ScreenSnapper.o: define.h ScreenSnapper.cpp ScreenSnapper.h
    152         gcc $(CFLAG) ScreenSnapper.cpp
    153 
    154 Lic.o: Renderable.o Lic.cpp Lic.h $(AUXSRC)
    155         gcc $(CFLAG) Lic.cpp
    156 
    157 Volume.o: Texture3D.o Volume.cpp Volume.h $(AUXSRC)
    158         gcc $(CFLAG) Volume.cpp
    159 
    160 ZincBlendeVolume.o: Volume.o ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
    161         gcc $(CFLAG) ZincBlendeVolume.cpp
    162 
    163 VolumeRenderer.o: $(OBJ_VOLUMERENDERER)  VolumeRenderer.h VolumeRenderer.cpp
    164         gcc $(CFLAG) VolumeRenderer.cpp
    165 
    166 PlaneRenderer.o: $(OBJ_PLANERENDERER)  PlaneRenderer.h PlaneRenderer.cpp
    167         gcc $(CFLAG) PlaneRenderer.cpp
    168 
     120ParticleSystem.o: ParticleSystem.cpp $(AUXSRC)
     121Renderable.o: Renderable.cpp Renderable.h
     122Camera.o: Camera.cpp Camera.h
     123ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h
     124Lic.o: Lic.cpp Lic.h $(AUXSRC)
     125Volume.o: Volume.cpp Volume.h $(AUXSRC)
     126ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
     127VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h
     128PlaneRenderer.o: PlaneRenderer.cpp PlaneRenderer.h
    169129Mat4x4.o: Mat4x4.cpp Mat4x4.h
    170         gcc $(CFLAG) Mat4x4.cpp
    171 
    172130Vector4.o: Vector4.cpp Vector4.h
    173         gcc $(CFLAG) Vector4.cpp
    174 
    175131Vector3.o: Vector3.cpp Vector3.h
    176         gcc $(CFLAG) Vector3.cpp
    177 
    178132Plane.o: Plane.cpp Plane.h
    179         gcc $(CFLAG) Plane.cpp
    180 
    181133ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h
    182         gcc $(CFLAG) ConvexPolygon.cpp
    183 
    184134PerfQuery.o: PerfQuery.cpp PerfQuery.h
    185         gcc $(CFLAG) PerfQuery.cpp
    186 
    187 nanovis.o: nanovis.h nanovis.cpp ParticleSystem.o $(AUXSRC)
    188         gcc $(CFLAG) nanovis.cpp
    189 
    190 R2string.o: $(R2SRC)/R2string.cpp $(R2INC)/R2/R2string.h
    191         gcc $(CFLAG) $(R2SRC)/R2string.cpp
    192 
    193 R2FilePath.o: $(R2SRC)/R2FilePath.cpp $(R2INC)/R2/R2FilePath.h
    194         gcc $(CFLAG) $(R2SRC)/R2FilePath.cpp
    195 
    196 R2Fonts.o: $(R2SRC)/R2Fonts.cpp $(R2INC)/R2/R2Fonts.h
    197         gcc $(CFLAG) $(R2SRC)/R2Fonts.cpp
    198 
    199 R2Object.o: $(R2SRC)/R2Object.cpp $(R2INC)/R2/R2Object.h
    200         gcc $(CFLAG) $(R2SRC)/R2Object.cpp
    201 
     135nanovis.o: nanovis.cpp nanovis.h $(AUXSRC)
  • trunk/vizservers/nanovis/start_server

    r580 r749  
    1717#export LD_LIBRARY_PATH
    1818
    19 exec /home/nanohub/vrinside/rappture/gui/vizservers/nanovis/nanoscale -l 2000 -b 2001 -s 128.210.189.255 -c "/home/nanohub/vrinside/rappture/gui/vizservers/nanovis/nanovis" > /dev/null 2>&1
     19exec /home/nanohub/dkearney/repo/rappture/gui/vizservers/nanovis/nanoscale -l 2002 -b 2002 -s 128.210.189.255 -c "/home/nanohub/dkearney/repo/rappture/gui/vizservers/nanovis/nanovis" > /dev/null 2>&1
  • trunk/vizservers/pymolproxy/Makefile

    r723 r749  
    1 CFLAGS  = -g -I/usr/include/tcl8.4
     1TARGETS = pymolproxy
     2
     3CC      = gcc
     4CFLAGS  = -g -O2 -I/usr/include/tcl8.4
    25LDFLAGS =
    3 TARGETS = pymolproxy
    4 INSTALL_DIR     = /opt/pymolproxy
     6# LDFLAGS = $(LDFLAGS)
     7
     8prefix          = /home/nanohub/dkearney/repo/viz_20070521
     9exec_prefix     = /home/nanohub/dkearney/repo/viz_20070521
     10bindir          = ${exec_prefix}/bin
     11libdir          = ${exec_prefix}/lib
     12includedir      = ${prefix}/include
     13mandir          = ${prefix}/man
     14
     15INSTALL         = /usr/bin/install -c
     16INSTALL_PROGRAM = ${INSTALL} -m 755
     17INSTALL_DATA    = ${INSTALL} -m 644
     18INSTALL_SCRIPT  = ${INSTALL} -m 644
     19
     20.PHONY: all install clean
    521
    622all: $(TARGETS)
    723
     24pymolproxy: pymolproxy.o
     25        $(CC) $(CFLAGS) $(LDFLAGS) -DSTANDALONE pymolproxy.c -o pymolproxy -ltcl8.4
     26
    827install: pymolproxy
    9         cp pymolproxy $(INSTALL_DIR)/bin/pymolproxy
    10 
    11 pymolproxy: pymolproxy.o
    12         cc $(CFLAGS) -DSTANDALONE pymolproxy.c -o pymolproxy -ltcl8.4
     28        $(INSTALL_PROGRAM) pymolproxy $(bindir)/pymolproxy
    1329
    1430clean:
  • trunk/vizservers/start_viz.sh

    r748 r749  
    66dir=$( mktemp -d /tmp/nanorun.XXXXXX )
    77
    8 cp -r nanovis/shaders ${dir}
    9 cp -r nanovis/resources ${dir}
    10 cp nanoscale/nanoscale nanovis/nanovis ${dir}
     8PATH=${dir}:/home/nanohub/dkearney/repo/viz_20070521/bin:$PATH
     9LD_LIBRARY_PATH=${dir}/lib:$LD_LIBRARY_PATH
     10export PATH LD_LIBRARY_PATH
     11
     12mkdir ${dir}/bin ${dir}/lib
     13
     14cp -r lib/shaders ${dir}
     15cp -r lib/resources ${dir}
     16cp lib/lib* ${dir}/lib
     17cp bin/voronoi bin/nanoscale bin/nanovis ${dir}
    1118
    1219cd ${dir}
    1320
    14 ./nanoscale -l 2000 -b 2000 -c 172.18.3.255 -c ${dir}/nanovis
     21${dir}/nanoscale -l 2020 -b 2020 -s 172.18.3.255 -c ${dir}/nanovis
Note: See TracChangeset for help on using the changeset viewer.