FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved demo references acros to being example references.

Browse Source
This commit is contained in:
Robert Osfield
2003-03-27 18:56:23 +00:00
parent 5b1969563b
commit 190c32c73a
8 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Make/distrules
View File

@@ -5,9 +5,9 @@ distribution :
$(INST_LIBS)\
$(INST_PLUGINS)\
$(INST_INCLUDE)\
$(INST_DEMOS)\
$(INST_EXAMPLES)\
$(INST_SRC)\
$(INST_DEMO_SRC)\
$(INST_EXAMPLE_SRC)\
$(INST_DOC)\
$(INST_DATA)

30
Make/help.sh
View File

@@ -5,8 +5,8 @@ TOPDIR=$2
INST_LIBS=$3
INST_PLUGINS=$4
INST_INCLUDE=$5
INST_DEMOS=$6
INST_DEMO_SRC=$7
INST_EXAMPLES=$6
INST_EXAMPLE_SRC=$7
INST_DOC=$8
INST_DATA=$9
@@ -61,22 +61,22 @@ The following targets may only be issued from the top-level OSG build:
make install - Install both execution environment and development
targets
make instbin - Install execution environment targets only. These
consist of libraries, plugins and demo programs.
consist of libraries, plugins and example programs.
Libraries are installed in
o $INST_LIBS,
plugins are installed in
o $INST_PLUGINS,
and demos are installed in
o $INST_DEMOS
and examples are installed in
o $INST_EXAMPLES
on $OS
make instdev - Install development targets only. These consist of
header files, source code to the demo programs, and
header files, source code to the example programs, and
documentation.
Header files are install in
o $INST_INCLUDE,
demo source code is installed in
o $INST_DEMO_SRC,
example source code is installed in
o $INST_EXAMPLE_SRC,
and documentation is installed in
o $INST_DOC
on $OS
@@ -105,19 +105,19 @@ installation locations for $OS.
make INST_LIBS=<libs_location> \\
INST_PLUGINS=<plugins_location>\\
INST_INCLUDE=<header_file_location>\\
INST_DEMOS=<demos_location>\\
INST_DEMO_SRC=<demo_src_location>\\
INST_EXAMPLES=<examples_location>\\
INST_EXAMPLE_SRC=<example_src_location>\\
INST_DOC=<doc_location>\\
install
- Installs libraries in <libs_location>, plugins in
<plugins_location>, header files in
<header_file_location>, demos in <demos_location>,
demo source code in <demo_src_location> and
<header_file_location>, examples in <examples_location>,
example source code in <example_src_location> and
documentation in <doc_location>
Note also that INST_LIBS, INST_PLUGINS, INST_INCLUDE, and INST_SHARE share
a common prefix by default: INST_LOCATION. Further INST_DEMOS, INST_DEMOS_SRC,
a common prefix by default: INST_LOCATION. Further INST_EXAMPES, INST_EXAMPLE_SRC,
INST_DOC, and INST_DATA share a common prefix by default : INST_SHARE, which
is located under INST_LOCATION by default. This provides a short cut for the
above 'make' usage. For example,
@@ -132,9 +132,9 @@ These values can be tested by reissuing 'make help' with these arguments.
After doing a 'make install' or 'make instlinks', and if not already added,
add
$INST_DEMOS
$INST_EXAMPLES
to your PATH environmental variable to run the demos. If it is not already
to your PATH environmental variable to run the examples. If it is not already
present, add
$INST_LIBS

22
Make/instdemosrc → Make/instexamplesrc
View File

@@ -4,7 +4,7 @@ TOPDIR=$1
INST_LIBS=$2
INST_INCLUDE=$3
INST_SRC=$4
INST_DEMO_SRC=$5
INST_EXAMPLE_SRC=$5
INSTALLCMD=$6
COMPILER=$7
OPTF=$8
@@ -24,25 +24,23 @@ TIFF_LIB=$2
[ "`uname`" = "Darwin" ] && MAKE=make || MAKE=gmake
copy_demo_source()
copy_example_source()
{
#DEMODIR=$TOPDIR/src/Demos/
DEMODIR=$TOPDIR/examples
for d in `ls $DEMODIR | grep -v CVS`
for d in `ls $TOPDIR/examples/ | grep -v CVS`
do
if [ -d $DEMODIR/$d ]
if [ -d $TOPDIR/examples/$d ]
then
THISDIR=`pwd`
cd $DEMODIR/$d
[ -d $INST_DEMO_SRC/$d ] || mkdir -m 0755 -p $INST_DEMO_SRC/$d
cd $TOPDIR/examples/$d
[ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
echo " installing $d"
for f in `$MAKE __instfiles | grep -v $MAKE`
do
src=`echo $f | cut -f1 -d"="`
dst=`echo $f | cut -f2 -d"="`
if [ -z "$dst" ] ; then dst=$src; fi
###echo $INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst
$INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst
###echo $INSTALLCMD `pwd`/$src $INST_EXAMPLE_SRC/$d/$dst
$INSTALLCMD `pwd`/$src $INST_EXAMPLE_SRC/$d/$dst
done
cd $THISDIR
fi
@@ -111,13 +109,13 @@ EOF1
[ -d $INST_SRC/Make ] || mkdir -m 0755 -p $INST_SRC/Make
echo =========== Installing Demo Source Code =================
echo =========== Installing Example Source Code =================
echo " generating make files ..."
generate_makedefs > $INST_SRC/Make/makedefs
generate_makerules > $INST_SRC/Make/makerules
echo " copying example files ..."
copy_demo_source
copy_example_source
exit 0

18
Make/instrules
View File

@@ -7,7 +7,7 @@ instbin instdev :
@$(MAKE) __$@
__instbin:
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_DEMOS) \
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_EXAMPLES) \
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBINCMD)" __install
@@ -16,7 +16,7 @@ __instbin:
@echo >> $(INSTLOGFILE)
@echo " Run-time environment installation successful. Add "\
>> $(INSTLOGFILE)
@echo " $(INST_DEMOS)"\
@echo " $(INST_EXAMPLES)"\
>> $(INSTLOGFILE)
@echo " to your PATH environmental variable, and"\
>> $(INSTLOGFILE)
@@ -36,12 +36,12 @@ __instdev:
INSTALL?="$(INSTDEVCMD)" __install;\
fi\
done
@$(TOPDIR)/Make/instdemosrc \
@$(TOPDIR)/Make/instexamplesrc \
$(TOPDIR)\
$(INST_LIBS)\
$(INST_INCLUDE)\
$(INST_SRC)\
$(INST_DEMO_SRC)\
$(INST_EXAMPLE_SRC)\
"$(INSTDEVCMD)"\
"$(C++)"\
"$(OPTF)"\
@@ -65,7 +65,7 @@ __instdev:
>> $(INSTLOGFILE)
@echo " compile flag when compiling with OSG header files."\
>> $(INSTLOGFILE)
@echo " Example programs can be found at $(INST_DEMO_SRC)."\
@echo " Example programs can be found at $(INST_EXAMPLE_SRC)."\
>> $(INSTLOGFILE)
@echo >> $(INSTLOGFILE)
@@ -89,7 +89,7 @@ instlinksdev :
instclean : instcleanbin instcleandev
instcleanbin :
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_DEMOS) \
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_EXAMPLES) \
INSTALL?="$(INSTBINCMD)" __instclean
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBINCMD)" __instclean
@@ -105,11 +105,11 @@ instcleandev :
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done
@for d in `ls -1 $(TOPDIR)/src/Demos | grep -v CVS`; \
@for d in `ls -1 $(TOPDIR)/examples | grep -v CVS`; \
do\
if [ -d $(TOPDIR)/src/Demos/$$d ]; \
if [ -d $(TOPDIR)/examples/$$d ]; \
then \
$(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
$(MAKE) INSTSRC=$(TOPDIR)/examples/$$d INSTDEST=$(INST_EXAMPLE_SRC)/$$d\
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done

12
Make/makedefs
View File

@@ -88,11 +88,11 @@ INST_LIBS = $(INST_LOCATION)/lib$(ARCHINST)
INST_PLUGINS = $(INST_LOCATION)/lib$(ARCHINST)/osgPlugins
INST_INCLUDE = $(INST_LOCATION)/include
INST_SHARE = $(INST_LOCATION)/share
INST_DEMOS = $(INST_SHARE)/OpenSceneGraph/bin
INST_EXAMPLES = $(INST_SHARE)/OpenSceneGraph/bin
INST_SRC = $(INST_SHARE)/OpenSceneGraph/src
INST_DOC = $(INST_SHARE)/OpenSceneGraph/doc
INST_DATA = $(INST_SHARE)/OpenSceneGraph/data
INST_DEMO_SRC = $(INST_SRC)/examples
INST_EXAMPLE_SRC = $(INST_SRC)/examples
LINK = ln -sf
INSTBINCMD = install -m 755
INSTDEVCMD = install -m 644
@@ -396,8 +396,8 @@ ifeq ($(OS),CYGWIN)
INST_INCLUDE = $(INST_SYS_PREFIX)/include
INST_SHARE_PREFIX = /usr/local/OpenSceneGraph
INST_SRC = $(INST_SHARE_PREFIX)/src
INST_DEMOS = $(INST_SHARE_PREFIX)/bin
INST_DEMO_SRC = $(INST_SHARE_PREFIX)/src/demos
INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin
INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/demos
INST_DOC = $(INST_SHARE_PREFIX)/doc
INST_DATA = $(INST_SHARE_PREFIX)/data
endif
@@ -442,8 +442,8 @@ ifeq ($(OS),MINGW)
INST_INCLUDE = $(INST_SYS_PREFIX)/include
INST_SHARE_PREFIX = /usr/local/OpenSceneGraph
INST_SRC = $(INST_SHARE_PREFIX)/src
INST_DEMOS = $(INST_SHARE_PREFIX)/bin
INST_DEMO_SRC = $(INST_SHARE_PREFIX)/src/examples
INST_EXAMPLES = $(INST_SHARE_PREFIX)/bin
INST_EXAMPLE_SRC = $(INST_SHARE_PREFIX)/src/examples
INST_DOC = $(INST_SHARE_PREFIX)/doc
INST_DATA = $(INST_SHARE_PREFIX)/data
endif

8
Make/makeirixdist
View File

@@ -7,7 +7,7 @@ echo_idb()
#####################################################################
# Capture bin directory
dd=`echo $INST_DEMOS | sed -e 's/\///'`
dd=`echo $INST_EXAMPLES | sed -e 's/\///'`
echo d 0755 root sys $dd $dd osg.eoe.sw
cd bin
for f in `find . -type l -print | grep -v CVS | sed -e 's/\.\///' | grep -v "\."`
@@ -44,7 +44,7 @@ echo_idb()
cd ..
#####################################################################
# Capture installed demo source
# Capture installed example source
dd=`echo $INST_SRC | sed -e 's/\///'`
THISDIR=`pwd`
@@ -129,9 +129,9 @@ TOPDIR=$2
INST_LIBS=$3
INST_PLUGINS=$4
INST_INCLUDE=$5
INST_DEMOS=$6
INST_EXAMPLES=$6
INST_SRC=$7
INST_DEMO_SRC=$8
INST_EXAMPLE_SRC=$8
shift;shift; shift;shift; shift;shift; shift;shift;
INST_DOC=$1
INST_DATA=$2

16
Make/makepkg
View File

@@ -158,9 +158,9 @@ TOPDIR=$2
INST_LIBS=$3
INST_PLUGINS=$4
INST_INCLUDE=$5
INST_DEMOS=$6
INST_EXAMPLES=$6
INST_SRC=$7
INST_DEMO_SRC=$8
INST_EXAMPLE_SRC=$8
shift;shift; shift;shift; shift;shift; shift;shift;
INST_DOC=$1
INST_DATA=$2
@@ -171,8 +171,8 @@ PKGSUBDIR=dist/PKG
make_package\
"OpenSceneGraph" \
"Open Scene Graph - Run-time environment"\
"An OpenGL based scene graph. This installation includes a set of run-time libraries, and demo programs"\
$INST_LIBS $INST_PLUGINS $INST_DEMOS\
"An OpenGL based scene graph. This installation includes a set of run-time libraries, and example programs"\
$INST_LIBS $INST_PLUGINS $INST_EXAMPLES\
make_installable "OpenSceneGraph"
@@ -188,12 +188,12 @@ do
done
#
# Capthre Demos subdirectories
# Capthre examples subdirectories
#
SUBDIRS=`ls $TOPDIR/src/Demos | grep -v CVS`
SUBDIRS=`ls $TOPDIR/src/examples | grep -v CVS`
for d in $SUBDIRS
do
dd="$INST_DEMO_SRC"/"$d"
dd="$INST_EXAMPLE_SRC"/"$d"
[ -d $dd ] && INSTARG="$INSTARG $dd"
done
@@ -211,7 +211,7 @@ ls $dd
make_package\
"OpenSceneGraph-dev"\
"Open Scene Graph - Development environment"\
"An OpenGL based scene graph. This installation includes header files and demo program source files"\
"An OpenGL based scene graph. This installation includes header files and example program source files"\
$INSTARG
make_installable "OpenSceneGraph-dev"

18
Make/makerpms
View File

@@ -110,14 +110,14 @@ make_osg()
s_install $TOPDIR/lib 755 $INST_LIBS
s_install $TOPDIR/lib/osgPlugins 755 $INST_PLUGINS
s_install $TOPDIR/bin 755 $INST_DEMOS
s_install $TOPDIR/bin 755 $INST_EXAMPLES
make_targz OpenSceneGraph-$REV
make_spec OpenSceneGraph
print_attr $INST_LIBS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec
print_attr $INST_PLUGINS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec
print_attr $INST_DEMOS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec
print_attr $INST_EXAMPLES 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec
rpmbuild -bb --clean $TOPDIR/dist/RPM/OpenSceneGraph.spec
@@ -137,11 +137,11 @@ make_osg_dev()
done
for d in `ls -1 $INST_DEMO_SRC`
for d in `ls -1 $INST_EXAMPLE_SRC`
do
if [ -d $INST_DEMO_SRC/$d ]
if [ -d $INST_EXAMPLE_SRC/$d ]
then
s_install $INST_DEMO_SRC/$d 644 $INST_DEMO_SRC/$d
s_install $INST_EXAMPLE_SRC/$d 644 $INST_EXAMPLE_SRC/$d
fi
cd $THISDIR
done
@@ -157,9 +157,9 @@ make_osg_dev()
print_attr $INST_INCLUDE/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec
done
for d in `ls -1 $RPM_BUILD_DIR/$INST_DEMO_SRC`
for d in `ls -1 $RPM_BUILD_DIR/$INST_EXAMPLE_SRC`
do
print_attr $INST_DEMO_SRC/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec
print_attr $INST_EXAMPLE_SRC/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec
done
print_attr $INST_SRC/Make 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec
@@ -190,9 +190,9 @@ TOPDIR=$2
INST_LIBS=$3
INST_PLUGINS=$4
INST_INCLUDE=$5
INST_DEMOS=$6
INST_EXAMPLES=$6
INST_SRC=$7
INST_DEMO_SRC=$8
INST_EXAMPLE_SRC=$8
shift;shift; shift;shift; shift;shift; shift;shift;
INST_DOC=$1
INST_DATA=$2