Dear Erich, I was in the middle of a (small and administrative) cleanup of CMakeLists.txt and oorexx.spec.in <http://oorexx.spec.in/> when I saw your change. Can you please elaborate what this change is about?
I have looked at 11899 and 11900 but did not get any wiser. I will do my change when it is safe. Mainly it is about getting these two files in sync and rearrange them so it is easier to keep track. I touch only the samples part of both. Hälsningar/Regards/Grüsse, P.O. Jonsson oor...@jonases.se > Anfang der weitergeleiteten Nachricht: > > Von: erich_st--- via Oorexx-svn <oorexx-...@lists.sourceforge.net> > Betreff: [Oorexx-svn] SF.net SVN: oorexx-code-0:[12051] > main/trunk/platform/unix > Datum: 5. April 2020 um 18:26:56 MESZ > An: oorexx-...@lists.sourceforge.net > Kopie: erich...@users.sf.net > Antwort an: oorexx-...@lists.sourceforge.net > > Revision: 12051 > http://sourceforge.net/p/oorexx/code-0/12051 > Author: erich_st > Date: 2020-04-05 16:26:55 +0000 (Sun, 05 Apr 2020) > Log Message: > ----------- > rolling back CMake changes [r11899] and [r1900] as agreed with Rene > > Modified Paths: > -------------- > main/trunk/platform/unix/debian/cmake/postinst.in > > Removed Paths: > ------------- > main/trunk/platform/unix/debian/cmake/prerm.in > main/trunk/platform/unix/oorexx-config.in > main/trunk/platform/unix/oorexx.spec.in > > Modified: main/trunk/platform/unix/debian/cmake/postinst.in > =================================================================== > --- main/trunk/platform/unix/debian/cmake/postinst.in 2020-04-05 16:24:28 UTC > (rev 12050) > +++ main/trunk/platform/unix/debian/cmake/postinst.in 2020-04-05 16:26:55 UTC > (rev 12051) > @@ -35,27 +35,4 @@ > #/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > #/* > */ > #/*----------------------------------------------------------------------------*/ > -orx_current=@ORX_SUBST_CURRENT@ > -orx_revision=@ORX_SUBST_REVISION@ > -orx_age=@ORX_SUBST_AGE@ > > -# Set up the library version suffix. > -orx_libversion=${orx_current}.${orx_age}.${orx_revision} > - > -orx_prefix=@prefix@ > - > -# Debian doesn't use lib64, so this is the same for 32-bit or 64-bit > -lib_dir=${orx_prefix}/lib > -bin_dir=${orx_prefix}/bin > -data_dir=${orx_prefix}/share/ooRexx > - > -prefix=@prefix@ > -datarootdir=@datarootdir@ > -exec_prefix=@exec_prefix@ > -includedir=@includedir@ > -libdir=@libdir@ > - > -update-alternatives --install /usr/bin/rexx rexx /usr/bin/rexx-oorexx 25 \ > - --slave /usr/bin/rxqueue rxqueue /usr/bin/rxqueue-oorexx \ > - --slave /usr/share/man/man1/rexx.1.gz rexx.1.gz > /usr/share/man/man1/rexx-oorexx.1.gz \ > - --slave /usr/share/man/man1/rxqueue.1.gz rxqueue.1.gz > /usr/share/man/man1/rxqueue-oorexx.1.gz > > Deleted: main/trunk/platform/unix/debian/cmake/prerm.in > =================================================================== > --- main/trunk/platform/unix/debian/cmake/prerm.in 2020-04-05 16:24:28 UTC > (rev 12050) > +++ main/trunk/platform/unix/debian/cmake/prerm.in 2020-04-05 16:26:55 UTC > (rev 12051) > @@ -1,39 +0,0 @@ > -#!/bin/sh > -#/*----------------------------------------------------------------------------*/ > -#/* > */ > -#/* Copyright (c) 2014-2018 Rexx Language Association. All rights reserved. > */ > -#/* > */ > -#/* This program and the accompanying materials are made available under > */ > -#/* the terms of the Common Public License v1.0 which accompanies this > */ > -#/* distribution. A copy is also available at the following address: > */ > -#/* http://www.oorexx.org/license.html > */ > -#/* > */ > -#/* Redistribution and use in source and binary forms, with or > */ > -#/* without modification, are permitted provided that the following > */ > -#/* conditions are met: > */ > -#/* > */ > -#/* Redistributions of source code must retain the above copyright > */ > -#/* notice, this list of conditions and the following disclaimer. > */ > -#/* Redistributions in binary form must reproduce the above copyright > */ > -#/* notice, this list of conditions and the following disclaimer in > */ > -#/* the documentation and/or other materials provided with the distribution. > */ > -#/* > */ > -#/* Neither the name of Rexx Language Association nor the names > */ > -#/* of its contributors may be used to endorse or promote products > */ > -#/* derived from this software without specific prior written permission. > */ > -#/* > */ > -#/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > */ > -#/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > */ > -#/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > */ > -#/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > */ > -#/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > */ > -#/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED > */ > -#/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, > */ > -#/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY > */ > -#/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > */ > -#/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > */ > -#/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > -#/* > */ > -#/*----------------------------------------------------------------------------*/ > -echo "Removing oorexx alternatives" >&2 > -update-alternatives --remove rexx /usr/bin/rexx-oorexx > > Deleted: main/trunk/platform/unix/oorexx-config.in > =================================================================== > --- main/trunk/platform/unix/oorexx-config.in 2020-04-05 16:24:28 UTC (rev > 12050) > +++ main/trunk/platform/unix/oorexx-config.in 2020-04-05 16:26:55 UTC (rev > 12051) > @@ -1,106 +0,0 @@ > -#!/bin/sh > -#/*----------------------------------------------------------------------------*/ > -#/* > */ > -#/* Copyright (c) 2014-2018 Rexx Language Association. All rights reserved. > */ > -#/* > */ > -#/* This program and the accompanying materials are made available under > */ > -#/* the terms of the Common Public License v1.0 which accompanies this > */ > -#/* distribution. A copy is also available at the following address: > */ > -#/* http://www.oorexx.org/license.html > */ > -#/* > */ > -#/* Redistribution and use in source and binary forms, with or > */ > -#/* without modification, are permitted provided that the following > */ > -#/* conditions are met: > */ > -#/* > */ > -#/* Redistributions of source code must retain the above copyright > */ > -#/* notice, this list of conditions and the following disclaimer. > */ > -#/* Redistributions in binary form must reproduce the above copyright > */ > -#/* notice, this list of conditions and the following disclaimer in > */ > -#/* the documentation and/or other materials provided with the distribution. > */ > -#/* > */ > -#/* Neither the name of Rexx Language Association nor the names > */ > -#/* of its contributors may be used to endorse or promote products > */ > -#/* derived from this software without specific prior written permission. > */ > -#/* > */ > -#/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > */ > -#/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > */ > -#/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > */ > -#/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > */ > -#/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > */ > -#/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED > */ > -#/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, > */ > -#/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY > */ > -#/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > */ > -#/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > */ > -#/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > -#/* > */ > -#/*----------------------------------------------------------------------------*/ > -version=@ORX_VERSION@ > -prefix=@CMAKE_INSTALL_PREFIX@ > -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ > -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ > - > -usage() > -{ > - echo "Usage: oorexx-config [OPTION]" > - echo "" > - echo "Available values for OPTION include:" > - echo "" > - echo " --help display this help and exit" > - echo " --cflags pre-processor and compiler flags" > - echo " [-I$includedir]" > - echo " --libs library linking information" > -# echo " [-L$libdir -l@SHLFILE@ @BOTHLIBS@ @SHLIBS@ > @DLFCNLIBDIR@ @THREADING_LINK@ @MH_FUNC_LIBS@ @REGINA_CONFIG_LIBS@]" > - echo " [-L$libdir -lrexx -lrexxapi" > - echo " --prefix oorexx install prefix" > - echo " [$prefix]" > - echo " --version output version information" > - echo " [$version]" > - exit $1 > -} > - > -if test $# -eq 0; then > - usage 1 > -fi > - > -while test $# -gt 0; do > - case "$1" in > - # this deals with options in the style > - # --option=value and extracts the value part > - # [not currently used] > - -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; > - *) value= ;; > - esac > - > - case "$1" in > - --prefix) > - echo $prefix > - ;; > - > - --version) > - echo $version > - exit 0 > - ;; > - > - --help) > - usage 0 > - ;; > - > - --cflags) > - echo -I$includedir > - ;; > - > - --libs) > -# echo -L$libdir -l@SHLFILE@ @BOTHLIBS@ @SHLIBS@ @DLFCNLIBDIR@ > @THREADING_LINK@ @MH_FUNC_LIBS@ @REGINA_CONFIG_LIBS@ > - echo -L$libdir -lrexx -lrexxapi > - ;; > - > - *) > - usage > - exit 1 > - ;; > - esac > - shift > -done > - > -exit 0 > > Deleted: main/trunk/platform/unix/oorexx.spec.in > =================================================================== > --- main/trunk/platform/unix/oorexx.spec.in 2020-04-05 16:24:28 UTC (rev > 12050) > +++ main/trunk/platform/unix/oorexx.spec.in 2020-04-05 16:26:55 UTC (rev > 12051) > @@ -1,222 +0,0 @@ > -# -*- rpm-spec -*- > -BuildRoot: > @CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@ > -Summary: @CPACK_RPM_PACKAGE_SUMMARY@ > -Name: > @CPACK_RPM_PACKAGE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_NAME@ > -Version: @CPACK_RPM_PACKAGE_VERSION@ > -Release: @CPACK_RPM_PACKAGE_RELEASE@ > -License: @CPACK_RPM_PACKAGE_LICENSE@ > -Group: @CPACK_RPM_PACKAGE_GROUP@ > -Vendor: @CPACK_RPM_PACKAGE_VENDOR@ > -Requires: @CPACK_RPM_PACKAGE_REQUIRES@ > -@TMP_RPM_URL@ > -@TMP_RPM_REQUIRES@ > -@TMP_RPM_PROVIDES@ > -@TMP_RPM_OBSOLETES@ > -@TMP_RPM_CONFLICTS@ > -@TMP_RPM_AUTOPROV@ > -@TMP_RPM_AUTOREQ@ > -@TMP_RPM_AUTOREQPROV@ > -@TMP_RPM_BUILDARCH@ > -@TMP_RPM_PREFIX@ > - > -#%#define _rpmdir @CPACK_RPM_DIRECTORY@ > -#%#define _rpmfilename @CPACK_RPM_FILE_NAME@.rpm > -%define _unpackaged_files_terminate_build 0 > -#%#define _topdir @CPACK_RPM_DIRECTORY@ > -@TMP_RPM_SPEC_INSTALL_POST@ > -@CPACK_RPM_SPEC_MORE_DEFINE@ > -@CPACK_RPM_COMPRESSION_TYPE_TMP@ > - > -%description > -@CPACK_RPM_PACKAGE_DESCRIPTION@ > - > -# This is a shortcutted spec file generated by CMake RPM generator > -# we skip _install step because CPack does that for us. > -# We do only save CPack installed tree in _prepr > -# and then restore it in build. > -%prep > -mv $RPM_BUILD_ROOT "%{_topdir}/tmpBBroot" > - > -%build > - > -%install > -if [ -e $RPM_BUILD_ROOT ]; > -then > - rm -rf $RPM_BUILD_ROOT > -fi > - > -mv %{_topdir}/tmpBBroot $RPM_BUILD_ROOT > - > -# adding update-alternatives support > -install -d $RPM_BUILD_ROOT%{_sysconfdir}/alternatives > - > -touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/rexx > -touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/rexx.1.gz > -touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/rxqueue > -touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/rxqueue.1.gz > - > -#mv $RPM_BUILD_ROOT%{_bindir}/rexx %{buildroot}%{_bindir}/rexx-oorexx > -#mv $RPM_BUILD_ROOT%{_mandir}/man1/rexx.1.gz > %{buildroot}%{_mandir}/man1/rexx-oorexx.1.gz > -#mv $RPM_BUILD_ROOT%{_bindir}/rxqueue %{buildroot}%{_bindir}/rxqueue-oorexx > -#mv $RPM_BUILD_ROOT%{_mandir}/man1/rxqueue.1.gz > %{buildroot}%{_mandir}/man1/rxqueue-oorexx.1.gz > - > -ln -sf %{_sysconfdir}/alternatives/rexx $RPM_BUILD_ROOT%{_bindir}/rexx > -ln -sf %{_sysconfdir}/alternatives/rexx.1.gz > $RPM_BUILD_ROOT%{_mandir}/man1/rexx.1.gz > -ln -sf %{_sysconfdir}/alternatives/rxqueue $RPM_BUILD_ROOT%{_bindir}/rxqueue > -ln -sf %{_sysconfdir}/alternatives/rxqueue.1.gz > $RPM_BUILD_ROOT%{_mandir}/man1/rxqueue.1.gz > - > -%clean > - > -%post > -# Add update-alternatives > -%{_sbindir}/update-alternatives --install %{_bindir}/rexx rexx > %{_bindir}/rexx-oorexx 25 \ > - --slave %{_bindir}/rxqueue rxqueue %{_bindir}/rxqueue-oorexx \ > - --slave %{_mandir}/man1/rxqueue.1.gz rxqueue.1.gz > %{_mandir}/man1/rxqueue-oorexx.1.gz \ > - --slave %{_mandir}/man1/rexx.1.gz rexx.1.gz > %{_mandir}/man1/rexx-oorexx.1.gz > - > -%postun > - > -%pre > - > -%preun > -#remove update-alternatives > -if [ ! -f %{_bindir}/rexx ] ; then > - %{_sbindir}/update-alternatives --remove rexx %{_bindir}/rexx-oorexx > -fi > - > -%files > -%defattr(-,root,root,-) > - > -%{_bindir}/rexx > -%{_bindir}/rexx-oorexx > -%{_bindir}/rxapi > -%{_bindir}/rexxc > -%{_bindir}/rxqueue > -%{_bindir}/rxqueue-oorexx > -%{_bindir}/rxsubcom > -%{_bindir}/rxregexp.cls > -%{_bindir}/rxftp.cls > -%{_bindir}/csvStream.cls > -%{_bindir}/json.cls > -%{_bindir}/dateparser.cls > -%{_bindir}/socket.cls > -%{_bindir}/streamsocket.cls > -%{_bindir}/mime.cls > -%{_bindir}/smtp.cls > -%{_bindir}/rexxtry.rex > -%{_bindir}/callrexx1 > -%{_bindir}/callrexx2 > -%{_bindir}/libwpipe1.so > -%{_bindir}/libwpipe2.so > -%{_bindir}/libwpipe3.so > -%{_bindir}/oorexx-config > - > -%{_libdir}/librexxapi.so.5.0.0 > -%{_libdir}/librexxapi.so > -%{_libdir}/librexxapi.so.3 > -%{_libdir}/librexxapi.so.4 > -%{_libdir}/librexx.so.5.0.0 > -%{_libdir}/librexx.so > -%{_libdir}/librexx.so.3 > -%{_libdir}/librexx.so.4 > -%{_libdir}/rexx.img > -%{_libdir}/librxmath.so.5.0.0 > -%{_libdir}/librxmath.so > -%{_libdir}/librxmath.so.3 > -%{_libdir}/librxmath.so.4 > -%{_libdir}/librxsock.so.5.0.0 > -%{_libdir}/librxsock.so > -%{_libdir}/librxsock.so.3 > -%{_libdir}/librxsock.so.4 > -%{_libdir}/librxregexp.so.5.0.0 > -%{_libdir}/librxregexp.so > -%{_libdir}/librxregexp.so.3 > -%{_libdir}/librxregexp.so.4 > -%{_libdir}/libhostemu.so.5.0.0 > -%{_libdir}/libhostemu.so > -%{_libdir}/libhostemu.so.3 > -%{_libdir}/libhostemu.so.4 > -%{_libdir}/librxunixsys.so.5.0.0 > -%{_libdir}/librxunixsys.so > -%{_libdir}/librxunixsys.so.3 > -%{_libdir}/librxunixsys.so.4 > -%{_includedir}/rexx.h > -%{_includedir}/rexxapidefs.h > -%{_includedir}/rexxapitypes.h > -%{_includedir}/rexxplatformapis.h > -%{_includedir}/rexxplatformdefs.h > -%{_includedir}/oorexxapi.h > -%{_includedir}/oorexxerrors.h > - > -%dir %{_datadir}/ooRexx > -%dir %{_datadir}/ooRexx/native.api > -%{_datadir}/ooRexx/rexxcps.rex > -%{_datadir}/ooRexx/ccreply.rex > -%{_datadir}/ooRexx/greply.rex > -%{_datadir}/ooRexx/guess.rex > -%{_datadir}/ooRexx/ktguard.rex > -%{_datadir}/ooRexx/makestring.rex > -%{_datadir}/ooRexx/month.rex > -%{_datadir}/ooRexx/philfork.rex > -%{_datadir}/ooRexx/properties.rex > -%{_datadir}/ooRexx/qdate.rex > -%{_datadir}/ooRexx/qtime.rex > -%{_datadir}/ooRexx/scclient.rex > -%{_datadir}/ooRexx/scserver.rex > -%{_datadir}/ooRexx/sfclient.rex > -%{_datadir}/ooRexx/sfserver.rex > -%{_datadir}/ooRexx/stack.rex > -%{_datadir}/ooRexx/usecomp.rex > -%{_datadir}/ooRexx/usepipe.rex > -%{_datadir}/ooRexx/arithmeticEvaluation.rex > -%{_datadir}/ooRexx/arrayCallback.rex > -%{_datadir}/ooRexx/concurrency.rex > -%{_datadir}/ooRexx/constrained.rex > -%{_datadir}/ooRexx/timezone.rex > -%{_datadir}/ooRexx/delegation.rex > -%{_datadir}/ooRexx/dynamicMethod.rex > -%{_datadir}/ooRexx/interface.rex > -%{_datadir}/ooRexx/singleLinkedList.rex > -%{_datadir}/ooRexx/sortComposite.rex > -%{_datadir}/ooRexx/synchronousConcurrency.rex > -%{_datadir}/ooRexx/treeTraversal.rex > -%{_datadir}/ooRexx/usetree.rex > -%{_datadir}/ooRexx/complex.cls > -%{_datadir}/ooRexx/pipe.cls > -%{_datadir}/ooRexx/semcls.cls > -%{_datadir}/ooRexx/treeDirectory.cls > -%{_datadir}/ooRexx/jabberwocky.txt > -%{_datadir}/ooRexx/rexx.sh > -%{_datadir}/ooRexx/rexx.csh > -%{_datadir}/ooRexx/readme.txt > -%{_datadir}/applications/rexxtry.desktop > - > -%{_datadir}/icons/hicolor/48x48/apps/oorexx.png > - > -%{_datadir}/ooRexx/native.api/stackOverflow > -%{_datadir}/ooRexx/native.api/stackOverflow.cpp > -%{_datadir}/ooRexx/native.api/runRexxProgram > -%{_datadir}/ooRexx/native.api/runRexxProgram.cpp > -%{_datadir}/ooRexx/native.api/HelloWorld.rex > -%{_datadir}/ooRexx/native.api/backward.fnc > -%{_datadir}/ooRexx/native.api/tooRecursiveTrapped.rex > -%{_datadir}/ooRexx/native.api/tooRecursiveUnhandled.rex > -%{_datadir}/ooRexx/native.api/ReadMe.txt > -%{_datadir}/ooRexx/native.api/Makefile.linux > - > -%{_mandir}/man1/rexxc.1.gz > -%{_mandir}/man1/rxsubcom.1.gz > -%{_mandir}/man1/rexx.1.gz > -%{_mandir}/man1/rexx-oorexx.1.gz > -%{_mandir}/man1/rxqueue-oorexx.1.gz > -%{_mandir}/man1/rxqueue.1.gz > -# > -# placemarkers for update-alternatives > -# > -%ghost %{_sysconfdir}/alternatives/rexx > -%ghost %{_sysconfdir}/alternatives/rexx.1.gz > -%ghost %{_sysconfdir}/alternatives/rxqueue > -%ghost %{_sysconfdir}/alternatives/rxqueue.1.gz > - > -%changelog > -@CPACK_RPM_SPEC_CHANGELOG@ > > > > _______________________________________________ > Oorexx-svn mailing list > oorexx-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/oorexx-svn
_______________________________________________ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
