From: vsr Date: Thu, 11 Sep 2008 04:25:46 +0000 (+0000) Subject: Implement 'make dist' and 'make distcheck' steps support X-Git-Tag: TG_TRIPOLI_qt4_porting~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=21ab13bcfd9f1339c9e4f520bc81895b7a8c5ae6;p=modules%2Fgui.git Implement 'make dist' and 'make distcheck' steps support --- diff --git a/Makefile.am b/Makefile.am index 62e21b1b5..40130e280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,9 @@ DIST_SUBDIRS = idl adm_local resources src doc bin DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=GUI_version.h +salomeinclude_DATA = GUI_version.h -EXTRA_DIST+= \ +EXTRA_DIST += \ build_configure \ clean_configure \ LICENCE @@ -50,7 +50,7 @@ dist-hook: usr_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) -docs:usr_docs +docs: usr_docs dev_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index f9243d2f5..facd4e6f4 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -20,6 +20,3 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files - -# this is for LIGHT module compatibility -dist_admlocalunix_DATA=make_conclude.in \ No newline at end of file diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index ecead78c2..0236bfbbd 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -7,47 +7,52 @@ # # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation +# translation (*.qm) files generation (lrelease) %.qm: resources/%.ts $(LRELEASE) $< -qm $@ -# resource files generation +# resource files generation (qrcc) qrc_%.cxx: %.qrc $(QRCC) $< -o $@ -name $(*F) -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cpp=%.qrc) $(nodist_salomeres_DATA:%.qm=resources/%.ts) +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) $(nodist_salomeres_DATA:%.qm=resources/%.ts) +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index a0f5c8488..03d050606 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -24,18 +24,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION - -EXTRA_DIST+= VERSION.in +# non-distributed files +nodist_salomescript_DATA = VERSION -# These files are executable scripts -dist_salomescript_SCRIPTS=\ - runLightSalome.csh \ +# distributed files +dist_salomescript_SCRIPTS = \ + runLightSalome.csh \ runLightSalome.sh diff --git a/configure.ac b/configure.ac index 383c0114a..905df6561 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # Modified by : Mikhail PONIKAROV (OCN) - autotools usage # -AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGUI]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -557,42 +557,16 @@ AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no]) -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome - -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) $INSTALL $i . ; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - echo echo --------------------------------------------- echo generating Makefiles and configure files echo --------------------------------------------- echo -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +# chmod +x ./bin/salome/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute @@ -609,9 +583,9 @@ AC_OUTPUT([ \ ./doc/Makefile \ ./doc/salome/Makefile \ ./doc/salome/gui/Makefile \ - ./doc/salome/gui/GUI/doxyfile \ + ./doc/salome/gui/doxyfile \ ./doc/salome/tui/Makefile \ - ./doc/salome/tui/GUI/doxyfile \ + ./doc/salome/tui/doxyfile \ ./src/Makefile \ ./src/CASCatch/Makefile \ ./src/Qtx/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 6a2c2428b..687e7ebca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,4 +24,4 @@ # $Header$ # -SUBDIRS= salome +SUBDIRS = salome diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 29f7e1854..be64a4fea 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -24,9 +24,9 @@ # $Header$ # -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui +SUBDIRS = tui gui +SUBDIRSTUI = tui +SUBDIRSGUI = gui usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ diff --git a/doc/salome/gui/GUI/doxyfile.in b/doc/salome/gui/GUI/doxyfile.in deleted file mode 100755 index dfb7f3614..000000000 --- a/doc/salome/gui/GUI/doxyfile.in +++ /dev/null @@ -1,44 +0,0 @@ -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "GUI Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -TAB_SIZE = 5 - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES - -#--------------------------------------------------------------------------- -#Input related options -#--------------------------------------------------------------------------- -INPUT = @srcdir@/input -FILE_PATTERNS = *.doc -IMAGE_PATH = @srcdir@/images - -#--------------------------------------------------------------------------- -#HTML related options -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = ./ -HTML_HEADER = @srcdir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -#HTML_STYLESHEET = @srcdir@/static/doxygen.css -TOC_EXPAND = YES -DISABLE_INDEX = NO -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 300 - -#--------------------------------------------------------------------------- -#LaTeX related option -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO - -#--------------------------------------------------------------------------- -#RTF related options -#--------------------------------------------------------------------------- -GENERATE_RTF = NO \ No newline at end of file diff --git a/doc/salome/gui/GUI/images/batchmode.png b/doc/salome/gui/GUI/images/batchmode.png deleted file mode 100644 index c439d7ebb..000000000 Binary files a/doc/salome/gui/GUI/images/batchmode.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/cataloggenerator.png b/doc/salome/gui/GUI/images/cataloggenerator.png deleted file mode 100755 index 51a0f2786..000000000 Binary files a/doc/salome/gui/GUI/images/cataloggenerator.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/choicepage.png b/doc/salome/gui/GUI/images/choicepage.png deleted file mode 100644 index e3afcc588..000000000 Binary files a/doc/salome/gui/GUI/images/choicepage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/clipping.png b/doc/salome/gui/GUI/images/clipping.png deleted file mode 100644 index 6d738558e..000000000 Binary files a/doc/salome/gui/GUI/images/clipping.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/closestudy.png b/doc/salome/gui/GUI/images/closestudy.png deleted file mode 100755 index fb7abe1dc..000000000 Binary files a/doc/salome/gui/GUI/images/closestudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/copy-paste.jpg b/doc/salome/gui/GUI/images/copy-paste.jpg deleted file mode 100755 index e243122b3..000000000 Binary files a/doc/salome/gui/GUI/images/copy-paste.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/dumpstudy.png b/doc/salome/gui/GUI/images/dumpstudy.png deleted file mode 100755 index f899e778c..000000000 Binary files a/doc/salome/gui/GUI/images/dumpstudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/findtool1.png b/doc/salome/gui/GUI/images/findtool1.png deleted file mode 100644 index c0577ba66..000000000 Binary files a/doc/salome/gui/GUI/images/findtool1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/findtool2.png b/doc/salome/gui/GUI/images/findtool2.png deleted file mode 100644 index a01966736..000000000 Binary files a/doc/salome/gui/GUI/images/findtool2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/geomview-alt.png b/doc/salome/gui/GUI/images/geomview-alt.png deleted file mode 100755 index e797b085d..000000000 Binary files a/doc/salome/gui/GUI/images/geomview-alt.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/graduatedaxes1.png b/doc/salome/gui/GUI/images/graduatedaxes1.png deleted file mode 100644 index cf021ba42..000000000 Binary files a/doc/salome/gui/GUI/images/graduatedaxes1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/icon_about.png b/doc/salome/gui/GUI/images/icon_about.png deleted file mode 100755 index bbbc7a931..000000000 Binary files a/doc/salome/gui/GUI/images/icon_about.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image100.gif b/doc/salome/gui/GUI/images/image100.gif deleted file mode 100644 index c44d68ffc..000000000 Binary files a/doc/salome/gui/GUI/images/image100.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image102.gif b/doc/salome/gui/GUI/images/image102.gif deleted file mode 100644 index 3507814ba..000000000 Binary files a/doc/salome/gui/GUI/images/image102.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image103.gif b/doc/salome/gui/GUI/images/image103.gif deleted file mode 100644 index be534c39e..000000000 Binary files a/doc/salome/gui/GUI/images/image103.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image105.gif b/doc/salome/gui/GUI/images/image105.gif deleted file mode 100644 index 4f6173f82..000000000 Binary files a/doc/salome/gui/GUI/images/image105.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image106.gif b/doc/salome/gui/GUI/images/image106.gif deleted file mode 100644 index 2bbcb4d94..000000000 Binary files a/doc/salome/gui/GUI/images/image106.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image108.gif b/doc/salome/gui/GUI/images/image108.gif deleted file mode 100644 index bec69e662..000000000 Binary files a/doc/salome/gui/GUI/images/image108.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image109.gif b/doc/salome/gui/GUI/images/image109.gif deleted file mode 100644 index 5dbba4646..000000000 Binary files a/doc/salome/gui/GUI/images/image109.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image157.gif b/doc/salome/gui/GUI/images/image157.gif deleted file mode 100644 index 2f66e05e7..000000000 Binary files a/doc/salome/gui/GUI/images/image157.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image54.jpg b/doc/salome/gui/GUI/images/image54.jpg deleted file mode 100755 index a67ac4c7a..000000000 Binary files a/doc/salome/gui/GUI/images/image54.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image65.gif b/doc/salome/gui/GUI/images/image65.gif deleted file mode 100755 index fbf6a81b9..000000000 Binary files a/doc/salome/gui/GUI/images/image65.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image67.gif b/doc/salome/gui/GUI/images/image67.gif deleted file mode 100755 index 4c5d4d67c..000000000 Binary files a/doc/salome/gui/GUI/images/image67.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image69.gif b/doc/salome/gui/GUI/images/image69.gif deleted file mode 100755 index f8ea563bb..000000000 Binary files a/doc/salome/gui/GUI/images/image69.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image70.gif b/doc/salome/gui/GUI/images/image70.gif deleted file mode 100755 index c88c53ed5..000000000 Binary files a/doc/salome/gui/GUI/images/image70.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image72.gif b/doc/salome/gui/GUI/images/image72.gif deleted file mode 100755 index 77c21bdeb..000000000 Binary files a/doc/salome/gui/GUI/images/image72.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image73.gif b/doc/salome/gui/GUI/images/image73.gif deleted file mode 100755 index 0ebcf97a2..000000000 Binary files a/doc/salome/gui/GUI/images/image73.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image75.gif b/doc/salome/gui/GUI/images/image75.gif deleted file mode 100755 index 9fdfbdc40..000000000 Binary files a/doc/salome/gui/GUI/images/image75.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image77.gif b/doc/salome/gui/GUI/images/image77.gif deleted file mode 100644 index ef7a62f32..000000000 Binary files a/doc/salome/gui/GUI/images/image77.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image86.gif b/doc/salome/gui/GUI/images/image86.gif deleted file mode 100644 index 339733193..000000000 Binary files a/doc/salome/gui/GUI/images/image86.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image88.gif b/doc/salome/gui/GUI/images/image88.gif deleted file mode 100644 index 9466aa6ce..000000000 Binary files a/doc/salome/gui/GUI/images/image88.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image89.gif b/doc/salome/gui/GUI/images/image89.gif deleted file mode 100644 index 373a6c026..000000000 Binary files a/doc/salome/gui/GUI/images/image89.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image91.gif b/doc/salome/gui/GUI/images/image91.gif deleted file mode 100644 index 9e93c1c72..000000000 Binary files a/doc/salome/gui/GUI/images/image91.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image94.gif b/doc/salome/gui/GUI/images/image94.gif deleted file mode 100755 index e2d310c5e..000000000 Binary files a/doc/salome/gui/GUI/images/image94.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image95.gif b/doc/salome/gui/GUI/images/image95.gif deleted file mode 100644 index fb293e234..000000000 Binary files a/doc/salome/gui/GUI/images/image95.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image96.gif b/doc/salome/gui/GUI/images/image96.gif deleted file mode 100644 index 4580d5b5c..000000000 Binary files a/doc/salome/gui/GUI/images/image96.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image97.gif b/doc/salome/gui/GUI/images/image97.gif deleted file mode 100644 index 1d78de1bc..000000000 Binary files a/doc/salome/gui/GUI/images/image97.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image98.gif b/doc/salome/gui/GUI/images/image98.gif deleted file mode 100644 index 6519dbb67..000000000 Binary files a/doc/salome/gui/GUI/images/image98.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image99.gif b/doc/salome/gui/GUI/images/image99.gif deleted file mode 100644 index 3711be813..000000000 Binary files a/doc/salome/gui/GUI/images/image99.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/import.png b/doc/salome/gui/GUI/images/import.png deleted file mode 100755 index 093c667f2..000000000 Binary files a/doc/salome/gui/GUI/images/import.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/intropage.png b/doc/salome/gui/GUI/images/intropage.png deleted file mode 100644 index 226793ca5..000000000 Binary files a/doc/salome/gui/GUI/images/intropage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/loadscript.png b/doc/salome/gui/GUI/images/loadscript.png deleted file mode 100755 index e681fc745..000000000 Binary files a/doc/salome/gui/GUI/images/loadscript.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/loadstudy2.png b/doc/salome/gui/GUI/images/loadstudy2.png deleted file mode 100755 index 595ea0528..000000000 Binary files a/doc/salome/gui/GUI/images/loadstudy2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/lockedstudy.png b/doc/salome/gui/GUI/images/lockedstudy.png deleted file mode 100755 index 9ec7e744b..000000000 Binary files a/doc/salome/gui/GUI/images/lockedstudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/neo-view2.png b/doc/salome/gui/GUI/images/neo-view2.png deleted file mode 100755 index df1c7fe0f..000000000 Binary files a/doc/salome/gui/GUI/images/neo-view2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/newsticn.jpg b/doc/salome/gui/GUI/images/newsticn.jpg deleted file mode 100755 index 94c8ee971..000000000 Binary files a/doc/salome/gui/GUI/images/newsticn.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/note1.gif b/doc/salome/gui/GUI/images/note1.gif deleted file mode 100755 index b53e21d0a..000000000 Binary files a/doc/salome/gui/GUI/images/note1.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/objectbrowser1.png b/doc/salome/gui/GUI/images/objectbrowser1.png deleted file mode 100755 index 16ab896a2..000000000 Binary files a/doc/salome/gui/GUI/images/objectbrowser1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/objectbrowser2.png b/doc/salome/gui/GUI/images/objectbrowser2.png deleted file mode 100755 index e010ef2b0..000000000 Binary files a/doc/salome/gui/GUI/images/objectbrowser2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/occviewer_axialscale.png b/doc/salome/gui/GUI/images/occviewer_axialscale.png deleted file mode 100644 index 82277c3fe..000000000 Binary files a/doc/salome/gui/GUI/images/occviewer_axialscale.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/occviewer_toolbar.png b/doc/salome/gui/GUI/images/occviewer_toolbar.png deleted file mode 100644 index 611504328..000000000 Binary files a/doc/salome/gui/GUI/images/occviewer_toolbar.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/open.jpg b/doc/salome/gui/GUI/images/open.jpg deleted file mode 100755 index 5829aef52..000000000 Binary files a/doc/salome/gui/GUI/images/open.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_clone.gif b/doc/salome/gui/GUI/images/plot2d_clone.gif deleted file mode 100644 index f980a5dd2..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_clone.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_legend.gif b/doc/salome/gui/GUI/images/plot2d_legend.gif deleted file mode 100644 index a40211e8a..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_legend.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_lines.gif b/doc/salome/gui/GUI/images/plot2d_lines.gif deleted file mode 100644 index 8d1dc2313..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_lines.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif deleted file mode 100644 index 3473ad94a..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif deleted file mode 100644 index 0d3b25ef4..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_points.gif b/doc/salome/gui/GUI/images/plot2d_points.gif deleted file mode 100644 index 6700f0078..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_points.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_settings.gif b/doc/salome/gui/GUI/images/plot2d_settings.gif deleted file mode 100644 index 87e1105c6..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_settings.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_splines.gif b/doc/salome/gui/GUI/images/plot2d_splines.gif deleted file mode 100644 index 1d50b2097..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_splines.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_view_settings.png b/doc/salome/gui/GUI/images/plot2d_view_settings.png deleted file mode 100644 index d4b4d29c2..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_view_settings.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/polyselection1.png b/doc/salome/gui/GUI/images/polyselection1.png deleted file mode 100755 index 1920e972d..000000000 Binary files a/doc/salome/gui/GUI/images/polyselection1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/polyselection2.png b/doc/salome/gui/GUI/images/polyselection2.png deleted file mode 100755 index 8467a4df3..000000000 Binary files a/doc/salome/gui/GUI/images/polyselection2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref1.png b/doc/salome/gui/GUI/images/ppref1.png deleted file mode 100755 index dd91013ce..000000000 Binary files a/doc/salome/gui/GUI/images/ppref1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref2.png b/doc/salome/gui/GUI/images/ppref2.png deleted file mode 100755 index 5a15f0e93..000000000 Binary files a/doc/salome/gui/GUI/images/ppref2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref3.png b/doc/salome/gui/GUI/images/ppref3.png deleted file mode 100755 index 1ecffe395..000000000 Binary files a/doc/salome/gui/GUI/images/ppref3.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref11.png b/doc/salome/gui/GUI/images/pref11.png deleted file mode 100755 index 26ddbe9b9..000000000 Binary files a/doc/salome/gui/GUI/images/pref11.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref12.png b/doc/salome/gui/GUI/images/pref12.png deleted file mode 100755 index 8cafab810..000000000 Binary files a/doc/salome/gui/GUI/images/pref12.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref13.png b/doc/salome/gui/GUI/images/pref13.png deleted file mode 100755 index 4cfe950cf..000000000 Binary files a/doc/salome/gui/GUI/images/pref13.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref14.png b/doc/salome/gui/GUI/images/pref14.png deleted file mode 100755 index e34268f17..000000000 Binary files a/doc/salome/gui/GUI/images/pref14.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref15.png b/doc/salome/gui/GUI/images/pref15.png deleted file mode 100755 index 10053fb11..000000000 Binary files a/doc/salome/gui/GUI/images/pref15.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref21.png b/doc/salome/gui/GUI/images/pref21.png deleted file mode 100755 index 8f7ad1d34..000000000 Binary files a/doc/salome/gui/GUI/images/pref21.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref22.png b/doc/salome/gui/GUI/images/pref22.png deleted file mode 100755 index 26921dc5a..000000000 Binary files a/doc/salome/gui/GUI/images/pref22.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref23.png b/doc/salome/gui/GUI/images/pref23.png deleted file mode 100644 index e1a082a14..000000000 Binary files a/doc/salome/gui/GUI/images/pref23.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref24.png b/doc/salome/gui/GUI/images/pref24.png deleted file mode 100755 index c539e9b8b..000000000 Binary files a/doc/salome/gui/GUI/images/pref24.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref31.png b/doc/salome/gui/GUI/images/pref31.png deleted file mode 100755 index e5606d133..000000000 Binary files a/doc/salome/gui/GUI/images/pref31.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref33.png b/doc/salome/gui/GUI/images/pref33.png deleted file mode 100755 index bdc9b7643..000000000 Binary files a/doc/salome/gui/GUI/images/pref33.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref34.png b/doc/salome/gui/GUI/images/pref34.png deleted file mode 100755 index 5072c62b6..000000000 Binary files a/doc/salome/gui/GUI/images/pref34.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref37.png b/doc/salome/gui/GUI/images/pref37.png deleted file mode 100755 index 1d4d082fe..000000000 Binary files a/doc/salome/gui/GUI/images/pref37.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref38.png b/doc/salome/gui/GUI/images/pref38.png deleted file mode 100755 index 5c8d31ce3..000000000 Binary files a/doc/salome/gui/GUI/images/pref38.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref39.png b/doc/salome/gui/GUI/images/pref39.png deleted file mode 100755 index 878a52607..000000000 Binary files a/doc/salome/gui/GUI/images/pref39.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref40.png b/doc/salome/gui/GUI/images/pref40.png deleted file mode 100755 index e86c1e250..000000000 Binary files a/doc/salome/gui/GUI/images/pref40.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage.png b/doc/salome/gui/GUI/images/productpage.png deleted file mode 100644 index bc05c8bfa..000000000 Binary files a/doc/salome/gui/GUI/images/productpage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage1.png b/doc/salome/gui/GUI/images/productpage1.png deleted file mode 100644 index b66616681..000000000 Binary files a/doc/salome/gui/GUI/images/productpage1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage2.png b/doc/salome/gui/GUI/images/productpage2.png deleted file mode 100644 index 998d286e3..000000000 Binary files a/doc/salome/gui/GUI/images/productpage2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/progresspage.png b/doc/salome/gui/GUI/images/progresspage.png deleted file mode 100644 index 0779fccaf..000000000 Binary files a/doc/salome/gui/GUI/images/progresspage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/progresspage1.png b/doc/salome/gui/GUI/images/progresspage1.png deleted file mode 100644 index efaa4d1ea..000000000 Binary files a/doc/salome/gui/GUI/images/progresspage1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/readmepage.png b/doc/salome/gui/GUI/images/readmepage.png deleted file mode 100644 index b6aee2989..000000000 Binary files a/doc/salome/gui/GUI/images/readmepage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry1.png b/doc/salome/gui/GUI/images/registry1.png deleted file mode 100755 index b8912c6ba..000000000 Binary files a/doc/salome/gui/GUI/images/registry1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry3.png b/doc/salome/gui/GUI/images/registry3.png deleted file mode 100755 index f44e2ec3a..000000000 Binary files a/doc/salome/gui/GUI/images/registry3.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry4.png b/doc/salome/gui/GUI/images/registry4.png deleted file mode 100755 index 98a3772b5..000000000 Binary files a/doc/salome/gui/GUI/images/registry4.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/save.jpg b/doc/salome/gui/GUI/images/save.jpg deleted file mode 100755 index 90001afb9..000000000 Binary files a/doc/salome/gui/GUI/images/save.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/selectcolor.png b/doc/salome/gui/GUI/images/selectcolor.png deleted file mode 100755 index 70800b28a..000000000 Binary files a/doc/salome/gui/GUI/images/selectcolor.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/selectfont.png b/doc/salome/gui/GUI/images/selectfont.png deleted file mode 100755 index 04eff08fd..000000000 Binary files a/doc/salome/gui/GUI/images/selectfont.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png b/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png deleted file mode 100644 index bdab73b7d..000000000 Binary files a/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png b/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png deleted file mode 100644 index 7f3696a56..000000000 Binary files a/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/studyproperties.png b/doc/salome/gui/GUI/images/studyproperties.png deleted file mode 100755 index af88317f1..000000000 Binary files a/doc/salome/gui/GUI/images/studyproperties.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/updaterate.png b/doc/salome/gui/GUI/images/updaterate.png deleted file mode 100755 index 4a6c29981..000000000 Binary files a/doc/salome/gui/GUI/images/updaterate.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/urbutton.png b/doc/salome/gui/GUI/images/urbutton.png deleted file mode 100755 index d7c0841e3..000000000 Binary files a/doc/salome/gui/GUI/images/urbutton.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/view2.png b/doc/salome/gui/GUI/images/view2.png deleted file mode 100755 index 9d48a09bb..000000000 Binary files a/doc/salome/gui/GUI/images/view2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/view_rotation_point.png b/doc/salome/gui/GUI/images/view_rotation_point.png deleted file mode 100644 index 7fe8f8389..000000000 Binary files a/doc/salome/gui/GUI/images/view_rotation_point.png and /dev/null differ diff --git a/doc/salome/gui/GUI/input/about_salome.doc b/doc/salome/gui/GUI/input/about_salome.doc deleted file mode 100644 index 4f132abae..000000000 --- a/doc/salome/gui/GUI/input/about_salome.doc +++ /dev/null @@ -1,12 +0,0 @@ -/*! - -\page about_salome_page About SALOME - - - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/creating_new_study.doc b/doc/salome/gui/GUI/input/creating_new_study.doc deleted file mode 100644 index 3c4d0e3cc..000000000 --- a/doc/salome/gui/GUI/input/creating_new_study.doc +++ /dev/null @@ -1,36 +0,0 @@ -/*! - -\page creating_new_study_page Creating a new study - -Study is a document within GUI, an abstraction layer between actual -document data (probably, remote data available through CORBA) and data -presentation (in the Object Browser). It contains a tree of Data -Object instances. - -To create a new study: - -\par -From the main menu select File > New or in the standard toolbar -click "New document" button. - -\image html newsticn.jpg ""New document" button" - -Your study will be created with default name \b Study1. In SALOME you -can create several studies. - -In addition to it, you can create several windows with different -activated viewers (VTK, OCC, Plot2d) for each study. - -To create a new window for a definite study: -
    -
  1. Make your study \b active: maximize it (if it minimized) or click on -the top control zone of the study window. -
    2. -
  2. \n From the main menu select Window > New Window and from the submenu -choose the viewer, which will be activated in a new window. -
    3. -
- -The window for your study will be created with a default name \b Study1. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/displaying_studies.doc b/doc/salome/gui/GUI/input/displaying_studies.doc deleted file mode 100644 index b45a8ed50..000000000 --- a/doc/salome/gui/GUI/input/displaying_studies.doc +++ /dev/null @@ -1,30 +0,0 @@ -/*! - -\page displaying_studies_page Displaying studies - -Starting from SALOME version 3.0.0. you are able to work in a -multi-desktop environment, which means that you can open as many -studies as you need, place them wherever you wish on the desktop, in -brief, work with Salome Platform like with a normal Windows -application. -\n Such windows as Object Browser and Python Console are dockable and -also can be placed at any part of the desktop. -\n Only one study window in representation area can be active. You can -change their size and move any windows between representation -areas. When an area becomes empty, it is not displayed. -\n All windows are placed inside tabs where you can switch between -them. If there are several windows (viewers) in your current study and -you want to display more then one at the same time, you can split -representation area into two parts, in horizontal or vertical -direction, to create two representation areas with windows be placed -in them. To do this, right-click on the tab and select Split -Vertically or Split Horizontally. - -For example, on this screen-shot the active zone has been split -horizontally to be able to work with OCC and VTK viewers -simultaneously, the one of the windows was split again, at this time -vertically to see Plot 2d graphs. - -\image html neo-view2.png - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/editing_studies.doc b/doc/salome/gui/GUI/input/editing_studies.doc deleted file mode 100644 index cafc03eed..000000000 --- a/doc/salome/gui/GUI/input/editing_studies.doc +++ /dev/null @@ -1,19 +0,0 @@ -/*! - -\page editing_studies_page Editing studies - -\b SALOME has \b Copy/Paste functionality allowing to edit your study -within a definite component: - -To copy/paste a definite object: -\par -In the main toolbar click "Copy"/"Paste" button or from the main menu -choose Edit > Copy/Paste option. - -\image html copy-paste.jpg ""Copy" and "Paste" buttons" - -\n The availability of \b Copy/Paste operations depends on the module and -the nature of an operation or an object, so if the module does not -provide this functionality, it won't be available. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/geometry_preferences.doc b/doc/salome/gui/GUI/input/geometry_preferences.doc deleted file mode 100644 index 651ef2e7e..000000000 --- a/doc/salome/gui/GUI/input/geometry_preferences.doc +++ /dev/null @@ -1,47 +0,0 @@ -/*! - -\page geometry_preferences_page Geometry preferences - -In the \b Geometry module you can set preferences for visualisation of -geometrical figures which can be used in later sessions with this -module. - -\image html pref15.png - -\par -For all color definitions click on the respective line to access to -the \ref select_color_and_font_page "Select Color" dialog box. - - - - - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/getting_started.doc b/doc/salome/gui/GUI/input/getting_started.doc deleted file mode 100644 index a06873543..000000000 --- a/doc/salome/gui/GUI/input/getting_started.doc +++ /dev/null @@ -1,20 +0,0 @@ -/*! - -\page getting_started_page Getting started - -When you start the SALOME Platform, the following initial desktop window appears: - -\image html view2.png - -    In general, the SALOME platform is destined -for performance of different numerical calculations and visualization -of the resulting data. For that purpose, in the SALOME environment the -following notion is used - \b Study. -
Study represents a working document in which you can realize all -operations connected with the SALOME functionality. -
SALOME is a multi-study platform. It means that simultaneously you can -work with several studies. - -\note To proceed working in SALOME you should create or open a new study. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/gui_module_chapter.doc b/doc/salome/gui/GUI/input/gui_module_chapter.doc deleted file mode 100644 index bc95ea061..000000000 --- a/doc/salome/gui/GUI/input/gui_module_chapter.doc +++ /dev/null @@ -1,40 +0,0 @@ -/*! - -\page gui_module_page GUI module - - - -*/ diff --git a/doc/salome/gui/GUI/input/index.doc b/doc/salome/gui/GUI/input/index.doc deleted file mode 100644 index 1f4d18053..000000000 --- a/doc/salome/gui/GUI/input/index.doc +++ /dev/null @@ -1,52 +0,0 @@ -/*! - -\mainpage GUI Module Reference Documentation - - - - -*/ diff --git a/doc/salome/gui/GUI/input/installing_salome.doc b/doc/salome/gui/GUI/input/installing_salome.doc deleted file mode 100644 index e0f26afe6..000000000 --- a/doc/salome/gui/GUI/input/installing_salome.doc +++ /dev/null @@ -1,961 +0,0 @@ -/*! - -\page installing_salome_page SALOME Installation Wizard Help - -
- -
-\anchor installing_products -

Installing products with the Installation Wizard

- -The Installation Wizard can be launched in two modes: \b GUI and \b -batch. -
The root directory of the Installation Wizard contains Python -script \b runInstall. To run the Installation Wizard just type \b runInstall. -in the terminal window: -

[ python ] \b runInstall [options] - -Without options this script will launch the SALOME Installation -Wizard in the default mode (GUI). \n The default installation settings -can be overridden by using command line options. Each option has a -short and a long notation: - --g / --gui -\par -Runs the Installation Wizard in the GUI mode (this is the default -mode). - --b / --batch -\par -Runs the Installation Wizard in the terminal mode. - --f FILE / --file=FILE -\par -The XML configuration file to be used by the Installation Wizard. If -this option is not used then the installation script tries to define -the \e Linux version and use the corresponding XML file if it exists. For -examle, for Linux Mandrake 10.1 the config_Mandrake_10.1.xml file -will be used by default. If no appropriate file is found, the file -config.xml will be used. This file refers to the basic target platform -which is Linux Mandrake 10.1 for SALOME 3.0 and newer. If config.xml -file is not found either, a warning message box is shown (in GUI mode) -or printed to the console (in batch mode) and the Installation Wizard -quits. - --d DIR / --target=DIR -\par -The target directory SALOME platform is to be installed to. -If used, this option overrides the default target directory, given in -the configuration XML file (usually ${HOME}/salome_\, -see \ref modifying_xml "here" for more details). - --t DIR / --tmp=DIR -\par -The directory, which should be used for temporary files. If given, -this option overrides the default temporary directory, given in the -configuration xml file (usually \b /tmp, see \ref modifying_xml "here" -for more information). - --a / --all-from-sources -\par -Forces all the products to be installed from sources (including all -SALOME modules). If this option is used, all default installation -modes for all products are ignored. -\n This option is helpful when the user wants to install SALOME on the -platform which is not officially supported. In this case, the user can -try to run the SALOME Installation Wizard with the \b -a option in order -to build all the products from sources. -\n Note, that this is a time-consuming operation which can take -more than 24 hours depending on the computer. - --h / --help -\par -Prints help information on the Installation Wizard's use. - --v / --version -\par -Prints version information (\b Note: this is the Installation Wizard's -version number, not the number of SALOME platform version). - -The installation procedure supports different \em Linux platforms and -installs various installation 3d-party prerequisite products which are -required by SALOME platform. As it was mentioned above, the basic -target platform for SALOME 3.0 and newer is Linux Mandrake 10.1. -Use of configuration XML files gives a flexible way to modify the list -of products to be installed by the Installation Wizard without -changing the program source code. Just create your own XML -configuration file and implement installation scripts for the -prerequisite products you need and then use this XML file with the -Installation Wizard. This can be done, for example, for some Linux -platform which is not supported directly by the Installation -Wizard. See \ref modifying_xml "Modifying XML configuration file" and -\ref installation_scripts "Implementing installation scripts for the new products" -sections for more information. - -
-\anchor gui_mode_install -

GUI mode

- -The Installation Wizard GUI has been developed using -Trolltech's Qt 3.0.5 toolkit. After launching the Installation -Wizard in the GUI mode the wizard window is shown to the user. This -wizard guides the user through several subsequent pages. To navigate -between the pages use \em "Next" and \em "Back" buttons in the lower -part of the wizard window. The \em "Cancel" button closes the wizard -window and quits the installation procedure after the user's -confirmation. The \em "Help" button opens an additional window to show -help information. - -The first \em "Introduction" page is shown in \ref figure_1 "Figure 1". -Skip this page by clicking \em "Next": - -\anchor figure_1 -\image html intropage.png -\n
Figure 1: "Introduction" page
- -In the second page you are proposed to enter the target directory -where the SALOME platform should be installed to. You can also click -"Browse..." and choose the destination folder using the standard -browse directory dialog box. -\n If the directory you want to install products to does not exist you -are prompted to confirm directory creation. If you type a wrong -directory path, or if you do not have write permissions -for the directory you use, the corresponding message box is shown. - -You can also change the temporary directory (which is used to store -temporary files required for the installation). -\n In the bottom part of the window the total disk space required for -the installation and for the temporary files is displayed (see below -for more details). - -In the GUI mode the Installation Wizard provides two different options -to install the SALOME platform: \b basic (default option) and -\b advanced. In the \b basic mode the user should enter the target -installation directory and temporary folder. All other installation -options are taken from the XML configuration file (see \ref figure_2 "Figure 2"): - -\anchor figure_2 -\image html productpage1.png -\n
Figure 2: "Installation settings"
- -In addition, you have a choice to use "Install all products from -sources" check box. If this option is turned on, all the products will -be installed from the sources (using their own build procedures). This -check box corresponds to the --all-from-sources (-a) option of -the \b runInstall script (see \ref installing_products "here"). - -\Note Installation of all products from sources is a long-time -operation. - -To switch to the \b advanced option, click "More..." (see -\ref figure_3 "Figure 3" ). - -In the advanced mode you have a possibility to select products to be -installed. Each product can have several options of installation: you -have a possibility to use the native product (provided with Linux -distribution and installed in the system folders), install already -precompiled binaries, build the product from sources or not install it -at all. Available options and default option are taken from the XML -configuration file. You can mark the products you want to install by -clicking the corresponding radio-buttons in the list view in the left -part of the page. -\n Note, that some products may require some other pre-requisite -products to be installed (or these prerequisite products should be -already available on your computer). The installation procedure has a -special feature to automatically mark these products in the list -view. For example, in order to install \b PyQt it is necessary to have -gcc, Python, Qt and \b Sip installed. Therefore all these -products will also be turned on when you check on \b PyQt. This -feature can be switched off by clicking the "Automatic -dependencies" checkbox. Turn on this checkbox if you want all -prerequisite products to be automatically checked when you select some -product to be installed. Turn off this checkbox if you want to disable -this feature. - -\anchor figure_3 -\image html productpage.png -\n
Figure 3: "Installation settings" page in the 'advanced' mode
- -If you want to use native products (like \b gcc, \b tcl, etc.), select "use -native" option. -\n Special button in the right part of the page - "Unselect All" - -allows to reset quickly all products to the "not install" state. -

-There are also two checkboxes on this page: "SALOME sources" -and "SALOME binaries". These three-state checkboxes allow -quick selecting/unselecting sources/binaries packages of SALOME -modules for installation. -

-In addition, when some SALOME sources are selected, one more check box -becomes available: "Build SALOME sources". If this option is -turned on, the selected SALOME modules will be built and installed -from sources. - -\note If this check box is turned on, the corresponding SALOME -module binaries package installation is disabled, because of SALOME -module sources and binaries packages conflict (see \ref figure_4 "Figure 4" below). - -\anchor figure_4 -\image html productpage2.png -\n
Figure 4: "Build SALOME sources" check box -usage
- -The box at the right side of the page displays the information about -currently highlighted product: name, version and short description, -required disk space, disk space required for temporary files, list of -prerequisites (this information is provided in the XML file) and -current user choice. -

-The "Disk space required:" field displays how much disk space -on the hard drive is required for installation of selected products. - -\note Please, take into account that the displayed amount of -required disk space is approximate and may differ when you install -products on your hard drive. - -The installation procedure uses a special directory to store temporary -files. The "Space for temporary files:" field shows the information -about required disk space on the hard drive for extracting and -compiling the selected products. You can change the temporary -directory - just type a path to the folder you want to use or click on -the corresponding "Browse..." button. - -\note Actually, temporary files are not stored directly in the -directory entered by the user. The Installation Wizard creates an -additional folder in this directory named something like -INSTALLWORKXXXXX where XXXXX is a unique number. This allows to launch -several Installation Wizards simultaneously. This temporary directory -is removed automatically when the installation finishes. - -The installation procedure also checks the available disk space. If -there is not enough disk space on your hard drive you will see a -corresponding error message box. - -\note You are strongly recommended not to use directory names -containing spaces. Otherwise you can experience -some troubles with the installation. - -To proceed further click "Next". At this moment the program will make -some tests to check installation settings: if there is enough disk -space on the hard drive, check for native products installation, -dependencies (prerequisites) for each product you have selected to be -installed. If any test fails you will see the corresponding warning -message box. Otherwise the wizard will proceed to the next page: - -\anchor figure_5 -\image html choicepage.png -\n
Figure 5: "Check your choice" page
- -This page summarizes the installation options you've made on the -previous pages. You can check again your choice and change it if -necessary by getting back to the previous page. -\n When you are sure that everything is OK, click "Next" to -follow to the \ref figure_6 "next page". - -\anchor figure_6 -\image html progresspage1.png -\n
Figure 6: "Installation progress" page
- -To start installation of the selected products click "Start". It -launches the shell installation script and you will be able to see the -output of the script in the dialog topmost frame. If any errors occur -during the installation progress the corresponding messages will be -printed to the log window in bold red font. - -It is possible to break the installation at any time by clicking -"Stop". Then you can get back to the previous pages if you wish to -change installation settings or restart installation by pressing again -"Start" button. - -\note In the current implementation it is not possible to resume -the stopped installation process; it will be re-started from the very -beginning. - -\anchor figure_7 -\image html progresspage.png -\n
Figure 7: "Installation progress" page: installation in progress
- -The "Installation Status" frame window shows you the progress of -installation. \c "Waiting" status means that installation of this product -has not been started yet. The product currently being installed is -marked as \c "Processing". All installed products have \c "Completed" -status. - -You can abort installation and close the installation procedure using -\em "Cancel" button. - -\note This button sends the signal "SIGTERM" to the shell -script. The script tries to clear all temporary files. The process of -removing temporary files can take some time, so the installation -wizard will wait 3 seconds before closing. - -At the end of installation (all selected products have been installed -successfully) you can go back to the previous pages to start a new -installation or click \em "Next" to go the Readme page: - -\anchor figure_8 -\image html readmepage.png -\n
Figure 8: "Finish installation" page
- -In this page you can read important information about the Instalation -Wizard itself and some tips: how to run and test SALOME or how to -build SALOME from the sources. This is the contents of the README file -which you can find in the root directory of the Installation Wizard. - -You can also launch SALOME Desktop from this page or read the Release -Notes file by clicking on the corresponding buttons in the lower part -of the page (see \ref modifying_xml "here" and \ref finish_buttons -"here" for more information about customizing these buttons). - -
-\anchor batch_mode_install -

Batch mode

- -To launch the Installation Wizard in the batch mode use -\b b (--\b batch) -parameter. -\n In this mode the GUI wizard is not shown but all the installation -status is displayed directly in the console. In the batch mode the -user does not have a possibility to change installation settings which -are given in the configuration file, except target and temporary -directories which can be overridden by the corresponding command line -options. -\n The only exception is --\b all-from-sources (-\b a) option which enables -special installation mode in which all the products (including SALOME -modules) are installed from sources, ignoring the default mode defined -in the XML configuration file (see \ref installing_products "here" for details). - -\anchor figure_9 -\image html batchmode.png -\n
Figure 9: Batch mode
- -
-\anchor environment_files -

Environment files

- -During the process of installation the script creates some environment -files to simplify the procedure of launching SALOME. These shell -scripts set all necessary environment variables for all products you -have installed. To learn how installation scripts collects the -environment, see \ref pick_up_env "here". These files are: \b -salome.csh + \b salome.sh in the KERNEL module sources -and KERNEL module binaries root directories and -\b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh in the target installation directory. - -\note there is some difference between these files: \b env_build.* -files are optimized to be used for building SALOME modules from -sources (see \b README file provided with the installation procedure -on the CD). The \b env_products.* (and \b salome.*) files are -optimized for SALOME launching. The behavior is defined by the -environment variable \b ENV_FOR_LAUNCH which is set to \b 0 in -env_build.* files and to \b 1 in env_products.* (salome.*) files. - -
-
-\anchor notes_on_check -

Notes on check products version procedure

- -Unfortunately there is no exact algorithm to identify the product -version under Linux platform. The information in this section gives an -idea how the version is checked for the native/preinstalled products -(this information refers to the base platform Linux Mandrake -10.1; and the same algorithms are used for other platforms). - -The general rule for all products is that the path to the binaries -should be set via the \b PATH environment variable, path to the libraries -should be set via the \b LD_LIBRARY_PATH variable and the python modules -should be available via the \b PYTHONPATH variable. - -\note the information given in this section refers to the prerequisite -products for SALOME version 3.2.4. - - - -If you have native products installed to directories different from -default ones (not \b /usr/bin, \b /usr/lib...), it is recommended to follow -the above mentioned instructions. Or you should properly set \b PATH and -\b LD_LIBRARY_PATH variables \em before starting the Installation -Wizard. Otherwise the installation script will fail to find -preinstalled/native products. - -\note for some native products (e.g. gcc, Python) the rules of version -checking are not so strict as described above. Only major and minor -version numbers should coincide with the prerequisite. Newer version -of the product can also be used. If some native product has version -number larger than that required by the installation procedure, the -user will be prompted by the warning message like this: "You have -newer version of gcc installed on your computer than that is required -(3.4.1). Continue?". You can click "\em Yes" to proceed with the -installation but in this case you should be aware of what you are -doing. SALOME binaries (including other products) are compiled with -the predefined prerequisites and most likely can not be run -successfully if these products are not found. This can be helpful only -if you plan to build all products from sources. - -
-
-\anchor pick_up_env -

Pick up the environment

- -Please, read the following information carefully . This section -describes how the installation procedure generates the environment -scripts for the SALOME platform being installed. -

-After installing each product shell the script creates a special -environment file for the product in its installation folder. The name -of the file is generated from the name of product by the following -scheme: \b env_.sh (for example \b env_Vtk.sh for the -Vtk). This file includes all necessary environment settings. At the -final step of the installation the script picks up all the settings -files and generates two common environment files from them: \b salome.sh -and \b salome.csh for \b bash and \b csh shells correspondingly. Such approach -helps to save time when reinstalling products and you may not bother -about setting all environment variables manually to build/launch -SALOME. What you simply need is to source one of these environment -files. -

-This also concerns those products which are not being installed. For -example, you install some SALOME binaries to the directory where you -have previously installed other products. The Installation procedure -tries to collect environment files from the target directory if it -finds necessary products installed there. If some product is not found -in the target directory the corresponding section of -\b salome.sh/salome.csh files will be skipped. -\n For native products (like \b gcc, \b tcl, etc...) the installation -procedure tries to find them first using \b PATH / \b LD_LIBRARY_PATH -variables and then in the system default directories (\b /usr/bin, -\b /usr/lib etc., depending on the product). -

-In any case you may edit \b salome.* files after the installation -procedure finishes, if you want. - -\note As it was mentioned \ref environment_files "above" there are -other environment files which are generated by the installation -procedure: \b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh. These files can be found in the target installation root -directory. - -
-
-\anchor modifying_xml -

Modifying XML configuration file

- -You can create your own XML configuration file. The Installation -Wizard can then take it as a command line argument to provide a list -of products you want to install with it. The list of products and some -other settings for the Installation Wizard are provided in the XML -file. The default file which Installation Wizard looks for if no -command line arguments are given, is \b config.xml. -\n This section describes the structure of the configuration file. -\n Optional sections/tags are in brackets. - -\code - - [ ] - [ caption= ] - [ copyright= ] - [ license= ] - [ os= ] - /> - ] - [ ] - [ tempdir= ] - /> - ] - [