Changeset 14112


Ignore:
Timestamp:
Nov 18, 2019 4:04:53 PM (4 weeks ago)
Author:
aramle
Message:

#5819 Copying correctly to install folder for Python 3.6

Location:
branches/dev-2385
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-2385/Makefile.am

    r14111 r14112  
    213213endif
    214214endif
    215     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     215    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    216216    if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
    217217    then \
     
    220220    fi; \
    221221    done
    222     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     222    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    223223    if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    224224    then \
     
    227227    fi; \
    228228    done
    229     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     229    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    230230    if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    231231    then \
     
    235235    done
    236236if JM_WIN64
    237     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     237    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    238238    if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
    239239    then \
     
    242242    fi; \
    243243    done
    244     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     244    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    245245    if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
    246246    then \
     
    249249    fi; \
    250250    done
    251     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     251    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    252252    if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    253253    then \
     
    256256    fi; \
    257257    done
    258     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     258    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    259259    if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    260260    then \
  • branches/dev-2385/Makefile.in

    r14111 r14112  
    11841184@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python_64/
    11851185@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    [ $(abs_top_srcdir) == $(DESTDIR)$(prefix) ] && echo "Installing in dist directory, don't copy LICENSE file" || cp $(abs_top_srcdir)/Python/LICENSE $(DESTDIR)$(prefix)/Python_64
    1186 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1186@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    11871187@PYTHON_ENABLED_TRUE@   if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
    11881188@PYTHON_ENABLED_TRUE@   then \
     
    11911191@PYTHON_ENABLED_TRUE@   fi; \
    11921192@PYTHON_ENABLED_TRUE@   done
    1193 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1193@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    11941194@PYTHON_ENABLED_TRUE@   if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    11951195@PYTHON_ENABLED_TRUE@   then \
     
    11981198@PYTHON_ENABLED_TRUE@   fi; \
    11991199@PYTHON_ENABLED_TRUE@   done
    1200 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1200@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    12011201@PYTHON_ENABLED_TRUE@   if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    12021202@PYTHON_ENABLED_TRUE@   then \
     
    12051205@PYTHON_ENABLED_TRUE@   fi; \
    12061206@PYTHON_ENABLED_TRUE@   done
    1207 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1207@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    12081208@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
    12091209@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    12121212@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    12131213@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1214 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1214@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    12151215@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
    12161216@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    12191219@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    12201220@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1221 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1221@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    12221222@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    12231223@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    12261226@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    12271227@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1228 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
     1228@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.6  lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.6  lib64/python3.7 Lib; do \
    12291229@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    12301230@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
Note: See TracChangeset for help on using the changeset viewer.