From fcf0e89877435bd6f8b4a61ce467b8b9a251999c Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:49:24 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- INSTALL | 4 +--- Makefile.in | 8 +++++++- adm_local/unix/config_files/check_RANDOMIZER.m4 | 9 +++++++++ adm_local/unix/make_commence.in | 17 +++++++++++------ bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 6 ++++-- idl/Makefile.in | 2 +- ...IZERCatalog.xml => RANDOMIZERCatalog.xml.in} | 2 +- 9 files changed, 35 insertions(+), 15 deletions(-) delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename resources/{RANDOMIZERCatalog.xml => RANDOMIZERCatalog.xml.in} (98%) diff --git a/INSTALL b/INSTALL index c9256d8..1279d94 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1 @@ -This is the version 0.2 of RANDOMIZER module -Requires : - - SALOME KERNEL 3.0.2 +SALOME2 : RANDOMIZER module (sample) diff --git a/Makefile.in b/Makefile.in index 18db8d3..ce91952 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ @@ -21,6 +21,12 @@ BIN_SCRIPT = VERSION inc: idl +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + depend: depend_idl depend_idl: diff --git a/adm_local/unix/config_files/check_RANDOMIZER.m4 b/adm_local/unix/config_files/check_RANDOMIZER.m4 index 9d6682c..bab47cf 100755 --- a/adm_local/unix/config_files/check_RANDOMIZER.m4 +++ b/adm_local/unix/config_files/check_RANDOMIZER.m4 @@ -12,6 +12,9 @@ AC_CHECKING(for Randomizer) Randomizer_ok=no +RANDOMIZER_CXXFLAGS="" +RANDOMIZER_LDFLAGS="" + AC_ARG_WITH(rnd, [ --with-rnd=DIR root directory path of RANDOMIZER module installation ], RANDOMIZER_DIR="$withval",RANDOMIZER_DIR="") @@ -31,7 +34,13 @@ if test -f ${RANDOMIZER_DIR}/idl/salome/Randomizer.idl ; then if test "x$RANDOMIZER_ROOT_DIR" == "x" ; then RANDOMIZER_ROOT_DIR=${RANDOMIZER_DIR} fi + + RANDOMIZER_LDFLAGS=-L${RANDOMIZER_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + RANDOMIZER_CXXFLAGS=-I${RANDOMIZER_ROOT_DIR}/include/salome + AC_SUBST(RANDOMIZER_ROOT_DIR) + AC_SUBST(RANDOMIZER_LDFLAGS) + AC_SUBST(RANDOMIZER_CXXFLAGS) else AC_MSG_WARN("Cannot find Randomizer module sources") fi diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 0b92ba9..4448b25 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,10 +10,15 @@ inc_builddir=$(top_builddir)/include/salome @SET_MAKE@ SHELL=/bin/sh +KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ + LIBS=@LIBS@ LIBSFORBIN=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome -LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(KERNEL_LDFLAGS) # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ LDFLAGSFORBIN+= -lstdc++ @@ -28,8 +33,8 @@ PYTHON_VERSION = @PYTHON_VERSION@ # Changes from the SalomePro V1.2c #PYTHON_SITE = @PYTHON_SITE@ #PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ -PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome +PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome # OMNIORB @@ -103,12 +108,12 @@ LN_S=@LN_S@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@/salome -libdir=@libdir@/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome idldir=$(prefix)/idl/salome -sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules incmakedir=${prefix}/salome_adm/unix docdir=$(datadir)/doc diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index 5e3db8b..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS RANDOMIZER COMPONENT - VERSION: 0.2 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..7a63ce4 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS RANDOMIZER COMPONENT - VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index 8fa7493..508dfcb 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,10 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=0.0.1 +VERSION=3.2.0 +XVERSION=0x030200 AC_SUBST(VERSION) +AC_SUBST(XVERSION) dnl dnl Initialize source and build root directories @@ -188,7 +190,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/idl/Makefile.in b/idl/Makefile.in index 15f63b3..460fa53 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -30,7 +30,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) diff --git a/resources/RANDOMIZERCatalog.xml b/resources/RANDOMIZERCatalog.xml.in similarity index 98% rename from resources/RANDOMIZERCatalog.xml rename to resources/RANDOMIZERCatalog.xml.in index c2929de..5b8a307 100644 --- a/resources/RANDOMIZERCatalog.xml +++ b/resources/RANDOMIZERCatalog.xml.in @@ -8,7 +8,7 @@ Randomizer OTHER Vadim SANDLER (VSR) - 0.2 + @VERSION@ unknown 0 RANDOMIZER.png -- 2.39.2