From 6c2ae9be8953d57193b19961741818bc1004962f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 26 Jun 2009 16:14:36 +0000 Subject: Fri Jun 26 16:10:10 UTC 2009 Johnny Willemsen * rpmbuild/ace-tao-init-suse/fillup-templates/*: Missing files for x.7.0 * rpmbuild/ace-tao-init-suse/tao: Removed, this are Fedora files * rpmbuild/ace-tao-ciao.spec: Copy the correct files for SuSE and print the g++ version in the build log which makes it easier to see which g++ version is used --- ACE/ChangeLog | 13 ++++++++ ACE/rpmbuild/ace-tao-ciao.spec | 14 +++++--- .../fillup-templates/tao-cosconcurrency | 23 ++++++++++++++ .../fillup-templates/tao-cosevent | 23 ++++++++++++++ .../fillup-templates/tao-cosnaming | 37 ++++++++++++++++++++++ .../fillup-templates/tao-cosnotification | 23 ++++++++++++++ .../fillup-templates/tao-costrading | 23 ++++++++++++++ .../ace-tao-init-suse/fillup-templates/tao-rtevent | 24 ++++++++++++++ .../ace-tao-init-suse/tao/tao-cosconcurrency.opt | 23 -------------- .../ace-tao-init-suse/tao/tao-cosevent.opt | 23 -------------- .../ace-tao-init-suse/tao/tao-cosnaming.opt | 37 ---------------------- .../ace-tao-init-suse/tao/tao-cosnotification.opt | 23 -------------- .../ace-tao-init-suse/tao/tao-costrading.opt | 23 -------------- ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt | 24 -------------- 14 files changed, 176 insertions(+), 157 deletions(-) create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading create mode 100755 ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt delete mode 100644 ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f14ad2fa8ec..2716523eeb5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Fri Jun 26 16:10:10 UTC 2009 Johnny Willemsen + + * rpmbuild/ace-tao-init-suse/fillup-templates/*: + Missing files for x.7.0 + + * rpmbuild/ace-tao-init-suse/tao: + Removed, this are Fedora files + + * rpmbuild/ace-tao-ciao.spec: + Copy the correct files for SuSE and print the g++ version in the + build log which makes it easier to see which g++ version is + used + Fri Jun 26 02:16:10 UTC 2009 Johnny Willemsen * include/makeinclude/platform_linux.GNU: diff --git a/ACE/rpmbuild/ace-tao-ciao.spec b/ACE/rpmbuild/ace-tao-ciao.spec index 51f5376e97c..a71487102f5 100644 --- a/ACE/rpmbuild/ace-tao-ciao.spec +++ b/ACE/rpmbuild/ace-tao-ciao.spec @@ -973,6 +973,11 @@ export ACE_ROOT=`pwd` export TAO_ROOT=$ACE_ROOT/TAO export LD_LIBRARY_PATH=$ACE_ROOT/lib +# Dump the g++ versions, in case the g++ version is broken we can +# easily see this in the build log +g++ --version +g++ -dumpversion + %if %skip_make cd .. && rm -rf ACE_wrappers && ln -s ACE_wrappers-BUILT ACE_wrappers %else @@ -1290,12 +1295,13 @@ cp -R ${ACE_ROOT}/rpmbuild/tao %{buildroot}%{_sysconfdir}/tao %if %{defined suse_version} mkdir -p %{buildroot}%{_sysconfdir}/init.d -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/tao/* %{buildroot}%{_sysconfdir}/tao +mkdir -p %{buildroot}%{_localstatedir}/adm +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d/ +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/fillup-templates/* %{buildroot}%{_localstatedir}/adm/ %else mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d -cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d/ +cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao/ %endif %if %{defined suse_version} diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency new file mode 100755 index 00000000000..3db9ca68639 --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosconcurrency @@ -0,0 +1,23 @@ +## Path: Network/tao-cosconcurrency +## Description: TAO Concurrency service settings +# +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" +## ServiceRestart: tao-cosconcurrency +# +# Specify desired default initial references arguments +TAO_COSCONCUR_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" + +## Type string +## Default: "-d -ORBDebugLevel 10" +## ServiceRestart: tao-cosconcurrency +# +# Enable debug logging, set to "" to disable +TAO_COSCONCUR_DEBUGLEVEL="-d -ORBDebugLevel 10" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-cosconcurrency.log" +## ServiceRestart: tao-cosconcurrency +# +# Configure log file +TAO_COSCONCUR_LOGFILE="-ORBLogFile /var/log/tao/tao-cosconcurrency.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent new file mode 100755 index 00000000000..4920d28382e --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosevent @@ -0,0 +1,23 @@ +## Path: Network/tao-cosevent +## Description: TAO Event service settings +# +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" +## ServiceRestart: tao-cosnaming +# +# Specify desired default initial references arguments +TAO_COSEVENT_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" + +## Type string +## Default: "" +## ServiceRestart: tao-cosnaming +# +# Enable debug logging, set to "-ORBDebugLevel 10" to enable. +TAO_COSEVENT_DEBUGLEVEL="" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-cosevent.log" +## ServiceRestart: tao-cosnaming +# +# Configure log file +TAO_COSEVENT_LOGFILE="-ORBLogFile /var/log/tao/tao-cosevent.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming new file mode 100755 index 00000000000..1a805f0ebcb --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnaming @@ -0,0 +1,37 @@ +## Path: Network/tao-cosnaming +## Description: TAO Naming service settings +# +## Type string +## Default: "-ORBListenEndpoints iiop://:2809" +## ServiceRestart: tao-cosnaming +# +# Specify desired endpoint arguments +TAO_COSNAMING_ENDPOINT="-ORBListenEndpoints iiop://:2809" + +## Type string +## Default: "-f /var/cache/tao/tao-cosnaming.dat" +## ServiceRestart: tao-cosnaming +# +# Location of persistance data file, comment out to disable persistance. +TAO_COSNAMING_PERSISTFILE="-f /var/cache/tao/tao-cosnaming.dat" + +## Type string +## Default: "" +## ServiceRestart: tao-cosnaming +# +# Enable multicast discovery, set to "-m 1" to enable +TAO_COSNAMING_MULTICAST="" + +## Type string +## Default: "" +## ServiceRestart: tao-cosnaming +# +# Enable debug logging, set to "-ORBDebugLevel 10" to enable. +TAO_COSNAMING_DEBUG = "" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-cosnaming.log" +## ServiceRestart: tao-cosnaming +# +# Configure log file +TAO_COSNAMING_LOGFILE="-ORBLogFile /var/log/tao/tao-cosnaming.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification new file mode 100755 index 00000000000..3501d02a003 --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-cosnotification @@ -0,0 +1,23 @@ +## Path: Network/tao-cosnotification +## Description: TAO Notification service settings +# +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809 -NameSvc" +## ServiceRestart: tao-cosnotification +# +# Specify desired default initial references arguments +TAO_COSNOTE_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809 -NameSvc" + +## Type string +## Default: "" +## ServiceRestart: tao-cosnotification +# +# Enable debug logging, set to "-ORBDebugLevel 10" to enable. +TAO_COSNOTE_DEBUGLEVEL="" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-cosnotification.log" +## ServiceRestart: tao-cosnotification +# +# Configure log file +TAO_COSNOTE_LOGFILE="-ORBLogFile /var/log/tao/tao-cosnotification.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading new file mode 100755 index 00000000000..edb136a7564 --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-costrading @@ -0,0 +1,23 @@ +## Path: Network/tao-costrading +## Description: TAO Trading service settings +# +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" +## ServiceRestart: tao-costrading +# +# Specify desired endpoint arguments +TAO_COSTRADING_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" + +## Type string +## Default: "" +## ServiceRestart: tao-costrading +# +# Debug logging, set to "-ORBDebugLevel 10" to enable. +TAO_COSTRADING_DEBUGLEVEL="" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-costrading.log" +## ServiceRestart: tao-costrading +# +# Configure log file +TAO_COSTRADING_LOGFILE="-ORBLogFile /var/log/tao/tao-costrading.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent new file mode 100755 index 00000000000..1939fb54500 --- /dev/null +++ b/ACE/rpmbuild/ace-tao-init-suse/fillup-templates/tao-rtevent @@ -0,0 +1,24 @@ +## Path: Network/tao-rtevent +## Description: TAO Event service settings +# +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" +## ServiceRestart: tao-rtevent +# +# Specify desired default initial references arguments +TAO_RTEVENT_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" + +## Type string +## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" +## ServiceRestart: tao-rtevent +# +# Enable debug logging, set to "-ORBDebugLevel 10" to enable. +TAO_RTEVENT_DEBUGLEVEL="" + +## Type string +## Default: "-ORBLogFile /var/log/tao/tao-rtevent.log" +## ServiceRestart: tao-rtevent +# +# Configure log file +TAO_RTEVENT_LOGFILE="-ORBLogFile /var/log/tao/tao-rtevent.log" + diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt deleted file mode 100644 index 3db9ca68639..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosconcurrency.opt +++ /dev/null @@ -1,23 +0,0 @@ -## Path: Network/tao-cosconcurrency -## Description: TAO Concurrency service settings -# -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" -## ServiceRestart: tao-cosconcurrency -# -# Specify desired default initial references arguments -TAO_COSCONCUR_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" - -## Type string -## Default: "-d -ORBDebugLevel 10" -## ServiceRestart: tao-cosconcurrency -# -# Enable debug logging, set to "" to disable -TAO_COSCONCUR_DEBUGLEVEL="-d -ORBDebugLevel 10" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-cosconcurrency.log" -## ServiceRestart: tao-cosconcurrency -# -# Configure log file -TAO_COSCONCUR_LOGFILE="-ORBLogFile /var/log/tao/tao-cosconcurrency.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt deleted file mode 100644 index 4920d28382e..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosevent.opt +++ /dev/null @@ -1,23 +0,0 @@ -## Path: Network/tao-cosevent -## Description: TAO Event service settings -# -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" -## ServiceRestart: tao-cosnaming -# -# Specify desired default initial references arguments -TAO_COSEVENT_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" - -## Type string -## Default: "" -## ServiceRestart: tao-cosnaming -# -# Enable debug logging, set to "-ORBDebugLevel 10" to enable. -TAO_COSEVENT_DEBUGLEVEL="" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-cosevent.log" -## ServiceRestart: tao-cosnaming -# -# Configure log file -TAO_COSEVENT_LOGFILE="-ORBLogFile /var/log/tao/tao-cosevent.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt deleted file mode 100644 index 1a805f0ebcb..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming.opt +++ /dev/null @@ -1,37 +0,0 @@ -## Path: Network/tao-cosnaming -## Description: TAO Naming service settings -# -## Type string -## Default: "-ORBListenEndpoints iiop://:2809" -## ServiceRestart: tao-cosnaming -# -# Specify desired endpoint arguments -TAO_COSNAMING_ENDPOINT="-ORBListenEndpoints iiop://:2809" - -## Type string -## Default: "-f /var/cache/tao/tao-cosnaming.dat" -## ServiceRestart: tao-cosnaming -# -# Location of persistance data file, comment out to disable persistance. -TAO_COSNAMING_PERSISTFILE="-f /var/cache/tao/tao-cosnaming.dat" - -## Type string -## Default: "" -## ServiceRestart: tao-cosnaming -# -# Enable multicast discovery, set to "-m 1" to enable -TAO_COSNAMING_MULTICAST="" - -## Type string -## Default: "" -## ServiceRestart: tao-cosnaming -# -# Enable debug logging, set to "-ORBDebugLevel 10" to enable. -TAO_COSNAMING_DEBUG = "" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-cosnaming.log" -## ServiceRestart: tao-cosnaming -# -# Configure log file -TAO_COSNAMING_LOGFILE="-ORBLogFile /var/log/tao/tao-cosnaming.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt deleted file mode 100644 index 3501d02a003..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnotification.opt +++ /dev/null @@ -1,23 +0,0 @@ -## Path: Network/tao-cosnotification -## Description: TAO Notification service settings -# -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809 -NameSvc" -## ServiceRestart: tao-cosnotification -# -# Specify desired default initial references arguments -TAO_COSNOTE_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809 -NameSvc" - -## Type string -## Default: "" -## ServiceRestart: tao-cosnotification -# -# Enable debug logging, set to "-ORBDebugLevel 10" to enable. -TAO_COSNOTE_DEBUGLEVEL="" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-cosnotification.log" -## ServiceRestart: tao-cosnotification -# -# Configure log file -TAO_COSNOTE_LOGFILE="-ORBLogFile /var/log/tao/tao-cosnotification.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt deleted file mode 100644 index edb136a7564..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-costrading.opt +++ /dev/null @@ -1,23 +0,0 @@ -## Path: Network/tao-costrading -## Description: TAO Trading service settings -# -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" -## ServiceRestart: tao-costrading -# -# Specify desired endpoint arguments -TAO_COSTRADING_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" - -## Type string -## Default: "" -## ServiceRestart: tao-costrading -# -# Debug logging, set to "-ORBDebugLevel 10" to enable. -TAO_COSTRADING_DEBUGLEVEL="" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-costrading.log" -## ServiceRestart: tao-costrading -# -# Configure log file -TAO_COSTRADING_LOGFILE="-ORBLogFile /var/log/tao/tao-costrading.log" diff --git a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt b/ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt deleted file mode 100644 index 1939fb54500..00000000000 --- a/ACE/rpmbuild/ace-tao-init-suse/tao/tao-rtevent.opt +++ /dev/null @@ -1,24 +0,0 @@ -## Path: Network/tao-rtevent -## Description: TAO Event service settings -# -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" -## ServiceRestart: tao-rtevent -# -# Specify desired default initial references arguments -TAO_RTEVENT_INITREF="-ORBDefaultInitRef corbaloc::localhost:2809" - -## Type string -## Default: "-ORBDefaultInitRef corbaloc::localhost:2809" -## ServiceRestart: tao-rtevent -# -# Enable debug logging, set to "-ORBDebugLevel 10" to enable. -TAO_RTEVENT_DEBUGLEVEL="" - -## Type string -## Default: "-ORBLogFile /var/log/tao/tao-rtevent.log" -## ServiceRestart: tao-rtevent -# -# Configure log file -TAO_RTEVENT_LOGFILE="-ORBLogFile /var/log/tao/tao-rtevent.log" - -- cgit v1.2.1