Changeset 352 for trunk


Ignore:
Timestamp:
08/31/15 09:47:56 (9 years ago)
Author:
dennis
Message:

The version number is somewhat automated, next step is actually to combine Makefile Makefile.rpm and force the user to use the pbs_python.spec file or the debian way.

Location:
trunk
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.rpm.in

    r346 r352  
    33RELEASE=1
    44
    5 #PYTHON_VERSION=2.3
    65PYTHON_VERSION=$(shell python -c "import re;import sys;print re.match('(?P<major>\d\.\d)',sys.version).group('major')")
    7 #LIBDIR=/usr/lib64
    86LIBDIR=$(shell if [ `uname -p` = 'x86_64' ]; then echo /usr/lib64; else echo /usr/lib; fi)
    97

  • trunk/configure

    r316 r352  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for pbs-python 4.4.1.
     3# Generated by GNU Autoconf 2.69 for pbs-python 4.6.1.
    44#
    55#
    … …  
    577577PACKAGE_NAME='pbs-python'
    578578PACKAGE_TARNAME='pbs-python'
    579 PACKAGE_VERSION='4.4.1'
    580 PACKAGE_STRING='pbs-python 4.4.1'
     579PACKAGE_VERSION='4.6.1'
     580PACKAGE_STRING='pbs-python 4.6.1'
    581581PACKAGE_BUGREPORT=''
    582582PACKAGE_URL=''
    … …  
    585585ac_subst_vars='LTLIBOBJS
    586586LIBOBJS
     587pbs_python_version
    587588pkgpyexecdir
    588589pkgpythondir
    … …  
    11851186  # This message is too long to be a string in the A/UX 3.1 sh.
    11861187  cat <<_ACEOF
    1187 \`configure' configures pbs-python 4.4.1 to adapt to many kinds of systems.
     1188\`configure' configures pbs-python 4.6.1 to adapt to many kinds of systems.
    11881189
    11891190Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    12461247if test -n "$ac_init_help"; then
    12471248  case $ac_init_help in
    1248      short | recursive ) echo "Configuration of pbs-python 4.4.1:";;
     1249     short | recursive ) echo "Configuration of pbs-python 4.6.1:";;
    12491250   esac
    12501251  cat <<\_ACEOF
    … …  
    13181319if $ac_init_version; then
    13191320  cat <<\_ACEOF
    1320 pbs-python configure 4.4.1
     1321pbs-python configure 4.6.1
    13211322generated by GNU Autoconf 2.69
    13221323
    … …  
    13351336running configure, to aid debugging if configure makes a mistake.
    13361337
    1337 It was created by pbs-python $as_me 4.4.1, which was
     1338It was created by pbs-python $as_me 4.6.1, which was
    13381339generated by GNU Autoconf 2.69.  Invocation command line was
    13391340
    … …  
    18831884
    18841885
    1885 ac_config_files="$ac_config_files Makefile setup.py"
     1886pbs_python_version="$(cat release.json | awk -F'\"' '/\"version\"/ {print $4}')"
     1887
     1888
     1889ac_config_files="$ac_config_files Makefile Makefile.rpm setup.py"
    18861890
    18871891cat >confcache <<\_ACEOF
    … …  
    24272431# values after options handling.
    24282432ac_log="
    2429 This file was extended by pbs-python $as_me 4.4.1, which was
     2433This file was extended by pbs-python $as_me 4.6.1, which was
    24302434generated by GNU Autoconf 2.69.  Invocation command line was
    24312435
    … …  
    24802484ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    24812485ac_cs_version="\\
    2482 pbs-python config.status 4.4.1
     2486pbs-python config.status 4.6.1
    24832487configured by $0, generated by GNU Autoconf 2.69,
    24842488  with options \\"\$ac_cs_config\\"
    … …  
    25912595  case $ac_config_target in
    25922596    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     2597    "Makefile.rpm") CONFIG_FILES="$CONFIG_FILES Makefile.rpm" ;;
    25932598    "setup.py") CONFIG_FILES="$CONFIG_FILES setup.py" ;;
    25942599

  • trunk/configure.in

    r348 r352  
    3636AM_PATH_PYTHON
    3737
     38AC_SUBST(pbs_python_version, "$(cat release.json | awk -F'\"' '/\"version\"/ {print $4}')")
     39
    3840AC_OUTPUT(
    39         Makefile
     41    Makefile
     42    Makefile.rpm
    4043        setup.py
    41         )
     44)

  • trunk/pbs_python.spec

    r346 r352  
    44
    55Name: pbs_python
    6 Version: 4.6.1
    7 Release: 1%{?dist}
    86License: See LICENSE
    97Group: Development/Libraries
    … …  
    2927%build
    3028%configure
    31 %{__python} setup.py build
     29#%{__python} setup.py build
    3230
    3331%install
    34 %{__python} ./setup.py install --prefix $RPM_BUILD_ROOT%{_prefix} ;
    35 %{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}/bin
    36 %{__install} -m0655 examples/sara_nodes.py ${RPM_BUILD_ROOT}%{_prefix}/bin/sara_nodes
    37 %{__install} -m0655 examples/new_rack_pbsmon.py ${RPM_BUILD_ROOT}%{_prefix}/bin/pbsmon
     32make install DESTDIR=$RPM_BUILD_DIR
     33#%{__python} ./setup.py install --prefix $RPM_BUILD_ROOT%{_prefix} ;
     34#%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}/bin
     35#%{__install} -m0655 examples/sara_nodes.py ${RPM_BUILD_ROOT}%{_prefix}/bin/sara_nodes
     36#%{__install} -m0655 examples/new_rack_pbsmon.py ${RPM_BUILD_ROOT}%{_prefix}/bin/pbsmon
    3837
    3938%clean
    … …  
    4847
    4948%changelog
     49* Mon Aug 31 2015 Dennis Stam <dennis.stam@surfsara.nl>
     50- Simplified the rpm build process, version is set by the Makefile
    5051* Tue Mar 24 2010 Ramon Bastiaans <ramon.bastiaans@sara.nl>
    5152- Updates for new version

  • trunk/setup.py.in

    r347 r352  
    8888setup (
    8989    name = 'pbs_python',
    90     version = '4.6.1',
     90    version = '@pbs_python_version@'
    9191    description = 'openpbs/torque python interface',
    9292    license = 'LGPLV3',
Note: See TracChangeset for help on using the changeset viewer.