Changeset 12304


Ignore:
Timestamp:
Jan 29, 2019 7:15:56 PM (10 months ago)
Author:
mjohnsson
Message:

#5726 Move 5 needed methods for types of Modification in order to resolve from environment

Location:
branches/dev-5726-orginal-annotation
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5726-orginal-annotation

  • branches/dev-5726-orginal-annotation/Compiler/ModelicaFrontEnd/src/jastadd/util/Annotations.jrag

    r12303 r12304  
    19341934    }
    19351935
     1936    public interface SrcAnnotationProvider {
     1937        /**
     1938         * Check if there is annotations at this location.
     1939         */
     1940        public boolean hasAnnotation();
     1941    }
     1942
     1943    public class SrcSingeltonProvider {
     1944        @Override
     1945        public boolean hasAnnotation() {
     1946            return provider.hasAnnotation();
     1947        }
     1948    }
     1949
     1950    public class ExpValueProvider {
     1951        @Override
     1952        public boolean hasAnnotation() {
     1953            return annotationSubNodes().iterator().hasNext();
     1954        }
     1955    }
     1956
     1957    public class SrcAnnotationsIteratorProvider {
     1958        @Override
     1959        public boolean hasAnnotation() {
     1960            return providers.size()>0 && annotationSubNodes().iterator().hasNext();
     1961        }
     1962    }
     1963
     1964    public class SrcModification {
     1965        @Override
     1966        public boolean hasAnnotation() {
     1967            return annotationSubNodes().iterator().hasNext();
     1968        }
     1969    }
     1970
     1971    public abstract class RootAnnotationProviderProxy {
     1972        @Override
     1973        public boolean hasAnnotation() {
     1974            return hasProvider();
     1975        }
     1976    }
     1977
     1978    @Override
     1979    public boolean SrcNamedArgument.hasAnnotation() {
     1980        return annotationSubNodes().iterator().hasNext();
     1981    }
     1982
     1983    @Override
     1984    public boolean SrcFunctionArguments.hasAnnotation() {
     1985        return annotationSubNodes().iterator().hasNext();
     1986    }
     1987
     1988    @Override
     1989    public boolean SrcParseAnnotation.hasAnnotation() {
     1990        return annotationSubNodes().iterator().hasNext();
     1991    }
     1992
     1993    syn boolean InstModification.isRedeclare() = false;
     1994    eq InstComponentRedeclare.isRedeclare()    = true;
     1995    eq InstClassRedeclare.isRedeclare()        = true;
     1996   
     1997
     1998   
    19361999    /**
    19372000     * Search for the applicable annotation from the enviroment. FilteredEnviroment
     
    19412004        Environment enviroment = myEnvironment();
    19422005        for (InstModification im : enviroment) {
    1943             if (im.matches(name())) {
     2006            if (im.matches(name()) && im.isRedeclare()) {
    19442007                SrcAnnotatable annotatable = im.getElementModification();
    19452008                SrcAnnotationProvider provider = annotatable.srcAnnotationProvider();
     
    19612024     */
    19622025    syn SrcAnnotatable InstClassDecl.orginalAnnotatable() = getSrcClassDecl();
     2026    eq InstReplacingFullClassDecl.orginalAnnotatable() = getOriginalClassDecl();
    19632027    syn SrcAnnotatable InstComponentDecl.orginalAnnotatable() = getSrcComponentDecl();
    1964     eq InstReplacingComposite.orginalAnnotatable() {
    1965         InstComponentDecl component = getOriginalInstComponent();
    1966         if (!component.isUnknown()) {
    1967             return component.getSrcComponentDecl();
    1968         }
    1969         // Throw or raise suitable exception
    1970         return getSrcComponentDecl();
    1971     }
     2028    eq InstReplacingComposite.orginalAnnotatable() = getOriginalDecl();
     2029    eq InstReplacingPrimitive.orginalAnnotatable() = getOriginalDecl();
    19722030   
    19732031    public SrcAnnotatable InstReplacingShortClassDecl.orginalAnnotatable() {
     
    20022060
    20032061    public SrcAnnotatable InstComponentDecl.mySrcAnnotatable() {
    2004         SrcAnnotatable annotatable = srcannotatableFromEnviroment();
    2005         if (annotatable != null) {
    2006             return annotatable;
    2007         }
    2008         SrcAnnotatable orginal = getSrcComponentDecl();
    2009         if (orginal.srcAnnotationProvider().hasAnnotation()) {
    2010             return orginal;
    2011         }
    2012         return myInstClass().mySrcAnnotatable();
     2062        boolean hasAnnotations = getSrcComponentDecl().srcAnnotationProvider().hasAnnotation();
     2063        if (!hasAnnotations) {
     2064            SrcAnnotatable annotatable = srcannotatableFromEnviroment();
     2065            if (annotatable != null) {
     2066                return annotatable;
     2067            }
     2068            SrcAnnotatable orginal = orginalAnnotatable();
     2069            if (orginal.srcAnnotationProvider().hasAnnotation()) {
     2070                return orginal;
     2071            }
     2072        }
     2073        return getSrcComponentDecl();
    20132074    }
    20142075   
  • branches/dev-5726-orginal-annotation/Compiler/ModelicaFrontEnd/test/modelica/AnnotationTests.mo

    r12296 r12304  
    113113        end BaseNoAnnotation;
    114114       
    115         model A
     115        model BaseWithAnnotation
    116116            replaceable package testPackage = BaseNoAnnotation annotation(Dialog(tab="a", group="b"));
    117117            replaceable BaseNoAnnotation testComponent() annotation(Dialog(tab="ac", group="b"));
     
    119119            InstClassMethodTestCase(
    120120                name="instAnnotationFromRedeclare",
    121                 description="Check that the Annotation .",
     121                description="Check that the annotation is from the replaceable.",
    122122                methodName="testClassAnnotations",
    123123                arguments={"testPackage"},
     
    125125    Dialog(tab = \"a\", group = \"b\")
    126126    ")})));
    127         end A;
     127        end BaseWithAnnotation;
    128128       
    129129        model B
    130             extends A;
     130            extends BaseWithAnnotation;
    131131            annotation(__JModelica(UnitTesting(tests={
    132132            InstClassMethodTestCase(
    133133                name="extendedHaveAnnotation",
    134                 description="Check that the Annotation .",
     134                description="Check that the annotation is inherited.",
    135135                methodName="testClassAnnotations",
    136136                arguments={"testPackage"},
     
    141141       
    142142        model C
    143             extends A(
     143            extends BaseWithAnnotation(
    144144                redeclare replaceable package testPackage
    145145                    = BaseNoAnnotation annotation(Dialog(tab="c", group="new")),
     
    150150            InstClassMethodTestCase(
    151151                name="replacedInExtend",
    152                 description="Check that the Annotation .",
     152                description="Check that the new annotation is used.",
    153153                methodName="testClassAnnotations",
    154154                arguments={"testPackage"},
     
    161161            InstClassMethodTestCase(
    162162                name="extendNoRedeclare",
    163                 description="Check that the Annotation .",
     163                description="Check that the inherited annotation is used.",
    164164                methodName="testClassAnnotations",
    165165                arguments={"testPackage"},
     
    186186            InstClassMethodTestCase(
    187187                name="AnnotationFromReplacedContainingPackage",
    188                 description="Check that the Annotation .",
     188                description="Check that the annotation from the alt class is used.",
    189189                methodName="testClassAnnotations",
    190190                arguments={"testPackage"},
     
    234234       
    235235        model D
    236             extends A(
     236            extends BaseWithAnnotation(
    237237                redeclare replaceable BaseNoAnnotation testComponent() annotation(),
    238238                redeclare replaceable package testPackage = BaseNoAnnotation annotation());
     239           
    239240            annotation(__JModelica(UnitTesting(tests={
    240241            InstClassMethodTestCase(
     
    258259       
    259260        model E
    260             extends A(
     261            extends BaseWithAnnotation(
    261262                redeclare replaceable package testPackage = BaseNoAnnotation,
    262263                redeclare replaceable BaseNoAnnotation testComponent()
  • branches/dev-5726-orginal-annotation/Makefile.am

    r11950 r12304  
    1717ACLOCAL_AMFLAGS = -I m4
    1818
    19 SUBDIRS = ThirdParty/winpthreads ThirdParty/SuperLU ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas ThirdParty/Lapack ThirdParty/MSL external/FMILibrary RuntimeLibrary Python
     19SUBDIRS = ThirdParty/winpthreads ThirdParty/SuperLU ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas ThirdParty/Lapack ThirdParty/MSL external/FMILibrary RuntimeLibrary
     20
     21if PYTHON_ENABLED
     22SUBDIRS += Python
     23endif
    2024
    2125assimulo_install_dir=$(abs_builddir)/Assimulo_install
     
    251255endif
    252256
     257
    253258build-python-packages:
    254 
     259if PYTHON_ENABLED
    255260if WITH_OPENMP
    256261    mkdir -p $(assimulo_build_dir); \
     
    362367endif
    363368endif
     369endif
     370
     371
    364372install-python-packages: build-python-packages
     373if PYTHON_ENABLED
    365374    mkdir -p $(DESTDIR)$(prefix)/Python
    366375    cp $(abs_top_srcdir)/Python/src/startup.py $(DESTDIR)$(prefix)/
     
    452461    [ -e $(DESTDIR)$(prefix)/bin/jm_ipython.sh  ] && echo "File exists, don't jm_ipython.sh" || cp Python/jm_ipython.sh $(DESTDIR)$(prefix)/bin/jm_ipython.sh
    453462    chmod ugo+x $(DESTDIR)$(prefix)/bin/jm_*.sh
    454 
     463endif
     464   
     465   
    455466# Hooks for extra build or install actions. Must be empty or the path of a shell script to execute.
    456467# Both scripts will get the source directory as the first argument and the install directory as the second.
     
    612623endif
    613624   
    614 
    615625clean-python-packages:
     626if PYTHON_ENABLED
    616627    if [ -d $(assimulo_build_dir)/Assimulo ]; then \
    617628        cd $(assimulo_build_dir)/Assimulo; \
     
    634645    python setup_pyjmi.py clean --all
    635646    -rm -rf $(pyjmi_install_dir)|| echo  Could not remove $(pyjmi_install_dir)
     647endif
    636648
    637649clean-frontends:
  • branches/dev-5726-orginal-annotation/Makefile.in

    r11950 r12304  
    4848build_triplet = @build@
    4949host_triplet = @host@
     50@PYTHON_ENABLED_TRUE@am__append_1 = Python
    5051subdir = .
    5152DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
     
    8485ETAGS = etags
    8586CTAGS = ctags
    86 DIST_SUBDIRS = $(SUBDIRS)
     87DIST_SUBDIRS = ThirdParty/winpthreads ThirdParty/SuperLU \
     88    ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas \
     89    ThirdParty/Lapack ThirdParty/MSL external/FMILibrary \
     90    RuntimeLibrary Python
    8791DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    8892distdir = $(PACKAGE)-$(VERSION)
     
    284288AUTOMAKE_OPTIONS = foreign
    285289ACLOCAL_AMFLAGS = -I m4
    286 SUBDIRS = ThirdParty/winpthreads ThirdParty/SuperLU ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas ThirdParty/Lapack ThirdParty/MSL external/FMILibrary RuntimeLibrary Python
     290SUBDIRS = ThirdParty/winpthreads ThirdParty/SuperLU \
     291    ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas \
     292    ThirdParty/Lapack ThirdParty/MSL external/FMILibrary \
     293    RuntimeLibrary $(am__append_1)
    287294assimulo_install_dir = $(abs_builddir)/Assimulo_install
    288295pymodelica_install_dir = $(abs_builddir)/pymodelica_install
     
    10031010
    10041011build-python-packages:
    1005 
    1006 @WITH_OPENMP_TRUE@  mkdir -p $(assimulo_build_dir); \
    1007 @WITH_OPENMP_TRUE@  cd $(abs_top_srcdir)/external; \
    1008 @WITH_OPENMP_TRUE@  find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir); \
    1009 @WITH_OPENMP_TRUE@  cd $(assimulo_build_dir)/Assimulo; \
    1010 @WITH_OPENMP_TRUE@  case $(build) in \
    1011 @WITH_OPENMP_TRUE@  *-cygwin*) \
    1012 @WITH_OPENMP_TRUE@  python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    1013 @WITH_OPENMP_TRUE@  *-mingw*) \
    1014 @WITH_OPENMP_TRUE@  python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    1015 @WITH_OPENMP_TRUE@  *) \
    1016 @WITH_OPENMP_TRUE@  python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
    1017 @WITH_OPENMP_TRUE@  esac
    1018 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   mkdir -p $(assimulo_build_dir64); \
    1019 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   cd $(abs_top_srcdir)/external; \
    1020 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir64); \
    1021 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   cd $(assimulo_build_dir)/Assimulo; \
    1022 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1023 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   export PYTHONHOME=$(PYTHON64_HOME); \
    1024 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build64/ --sundials-home=$(SUNDIALS_HOME)64 --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install64/ --lapack-home=$(abs_builddir)/lapack_install64/ --force-32bit="false" $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir64); \
    1025 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   export PATH="$(ORIG_PATH)"; \
    1026 @JM_WIN64_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@   export PYTHONHOME=$(ORIG_PYTHON_HOME)
    1027 @WITH_OPENMP_FALSE@ mkdir -p $(assimulo_build_dir); \
    1028 @WITH_OPENMP_FALSE@ cd $(abs_top_srcdir)/external; \
    1029 @WITH_OPENMP_FALSE@ find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir); \
    1030 @WITH_OPENMP_FALSE@ cd $(assimulo_build_dir)/Assimulo; \
    1031 @WITH_OPENMP_FALSE@ case $(build) in \
    1032 @WITH_OPENMP_FALSE@ *-cygwin*) \
    1033 @WITH_OPENMP_FALSE@ python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    1034 @WITH_OPENMP_FALSE@ *-mingw*) \
    1035 @WITH_OPENMP_FALSE@ python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    1036 @WITH_OPENMP_FALSE@ *) \
    1037 @WITH_OPENMP_FALSE@ python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
    1038 @WITH_OPENMP_FALSE@ esac
    1039 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
    1040 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  cd $(abs_top_srcdir)/external; \
    1041 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir64); \
    1042 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  cd $(assimulo_build_dir64)/Assimulo; \
    1043 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1044 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  export PYTHONHOME=$(PYTHON64_HOME); \
    1045 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  python setup.py install --sundials-home=$(SUNDIALS_HOME)64 --blas-home=$(abs_builddir)/blas_install64/ --lapack-home=$(abs_builddir)/lapack_install64/ --force-32bit="false" $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir64) ; \
    1046 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  export PATH="$(ORIG_PATH)"; \
    1047 @JM_WIN64_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@  export PYTHONHOME=$(ORIG_PYTHON_HOME)
    1048     cd $(abs_top_srcdir)/Python/src; \
    1049     python setup_pymodelica.py install --prefix=$(pymodelica_install_dir); \
    1050     rm -rf build
    1051 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cd $(abs_top_srcdir)/Python/src; \
    1052 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1053 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    1054 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ python setup_pymodelica.py install --prefix=$(pymodelica_install_dir64); \
    1055 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH="$(ORIG_PATH)"; \
    1056 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    1057 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -rf build
    1058     mkdir -p $(pyfmi_build_dir); \
    1059     cd $(abs_top_srcdir)/external; \
    1060     find PyFMI -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(pyfmi_build_dir); \
    1061     cd $(pyfmi_build_dir)/PyFMI; \
    1062     case $(build) in \
    1063     *-cygwin*) \
    1064     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
    1065     *-mingw*) \
    1066     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
    1067     *) \
    1068     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --prefix=$(pyfmi_install_dir) ;; \
    1069     esac
    1070     rm -rf build
    1071 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ mkdir -p $(pyfmi_build_dir64); \
    1072 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cd $(abs_top_srcdir)/external; \
    1073 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ find PyFMI -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(pyfmi_build_dir64); \
    1074 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cd $(pyfmi_build_dir64)/PyFMI; \
    1075 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1076 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    1077 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ python setup.py install --fmil-home=$(abs_builddir)/FMIL_install64/ $(NUMPY_NO_MSVCR_ARG) --prefix=$(pyfmi_install_dir64); \
    1078 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH="$(ORIG_PATH)"; \
    1079 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    1080 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -rf build
    1081     cd $(abs_top_srcdir)/Python/src; \
    1082     python setup_pyjmi.py install --prefix=$(pyjmi_install_dir); \
    1083     rm -rf build
    1084 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cd $(abs_top_srcdir)/Python/src; \
    1085 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1086 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    1087 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ python setup_pyjmi.py install --prefix=$(pyjmi_install_dir64); \
    1088 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PATH="$(ORIG_PATH)"; \
    1089 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    1090 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -rf build
     1012@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ mkdir -p $(assimulo_build_dir); \
     1013@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ cd $(abs_top_srcdir)/external; \
     1014@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir); \
     1015@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ cd $(assimulo_build_dir)/Assimulo; \
     1016@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ case $(build) in \
     1017@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-cygwin*) \
     1018@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1019@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-mingw*) \
     1020@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1021@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *) \
     1022@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
     1023@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ esac
     1024@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
     1025@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  cd $(abs_top_srcdir)/external; \
     1026@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir64); \
     1027@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  cd $(assimulo_build_dir)/Assimulo; \
     1028@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     1029@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  export PYTHONHOME=$(PYTHON64_HOME); \
     1030@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build64/ --sundials-home=$(SUNDIALS_HOME)64 --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install64/ --lapack-home=$(abs_builddir)/lapack_install64/ --force-32bit="false" $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir64); \
     1031@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  export PATH="$(ORIG_PATH)"; \
     1032@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  export PYTHONHOME=$(ORIG_PYTHON_HOME)
     1033@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    mkdir -p $(assimulo_build_dir); \
     1034@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    cd $(abs_top_srcdir)/external; \
     1035@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir); \
     1036@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    cd $(assimulo_build_dir)/Assimulo; \
     1037@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    case $(build) in \
     1038@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *-cygwin*) \
     1039@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1040@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *-mingw*) \
     1041@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1042@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *) \
     1043@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
     1044@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    esac
     1045@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ mkdir -p $(assimulo_build_dir64); \
     1046@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ cd $(abs_top_srcdir)/external; \
     1047@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ find Assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(assimulo_build_dir64); \
     1048@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ cd $(assimulo_build_dir64)/Assimulo; \
     1049@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     1050@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
     1051@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ python setup.py install --sundials-home=$(SUNDIALS_HOME)64 --blas-home=$(abs_builddir)/blas_install64/ --lapack-home=$(abs_builddir)/lapack_install64/ --force-32bit="false" $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir64) ; \
     1052@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ export PATH="$(ORIG_PATH)"; \
     1053@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@@WITH_PYTHON64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME)
     1054@PYTHON_ENABLED_TRUE@   cd $(abs_top_srcdir)/Python/src; \
     1055@PYTHON_ENABLED_TRUE@   python setup_pymodelica.py install --prefix=$(pymodelica_install_dir); \
     1056@PYTHON_ENABLED_TRUE@   rm -rf build
     1057@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cd $(abs_top_srcdir)/Python/src; \
     1058@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     1059@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(PYTHON64_HOME); \
     1060@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    python setup_pymodelica.py install --prefix=$(pymodelica_install_dir64); \
     1061@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH="$(ORIG_PATH)"; \
     1062@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
     1063@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -rf build
     1064@PYTHON_ENABLED_TRUE@   mkdir -p $(pyfmi_build_dir); \
     1065@PYTHON_ENABLED_TRUE@   cd $(abs_top_srcdir)/external; \
     1066@PYTHON_ENABLED_TRUE@   find PyFMI -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(pyfmi_build_dir); \
     1067@PYTHON_ENABLED_TRUE@   cd $(pyfmi_build_dir)/PyFMI; \
     1068@PYTHON_ENABLED_TRUE@   case $(build) in \
     1069@PYTHON_ENABLED_TRUE@   *-cygwin*) \
     1070@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     1071@PYTHON_ENABLED_TRUE@   *-mingw*) \
     1072@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     1073@PYTHON_ENABLED_TRUE@   *) \
     1074@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --prefix=$(pyfmi_install_dir) ;; \
     1075@PYTHON_ENABLED_TRUE@   esac
     1076@PYTHON_ENABLED_TRUE@   rm -rf build
     1077@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    mkdir -p $(pyfmi_build_dir64); \
     1078@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cd $(abs_top_srcdir)/external; \
     1079@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    find PyFMI -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(pyfmi_build_dir64); \
     1080@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cd $(pyfmi_build_dir64)/PyFMI; \
     1081@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     1082@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(PYTHON64_HOME); \
     1083@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    python setup.py install --fmil-home=$(abs_builddir)/FMIL_install64/ $(NUMPY_NO_MSVCR_ARG) --prefix=$(pyfmi_install_dir64); \
     1084@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH="$(ORIG_PATH)"; \
     1085@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
     1086@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -rf build
     1087@PYTHON_ENABLED_TRUE@   cd $(abs_top_srcdir)/Python/src; \
     1088@PYTHON_ENABLED_TRUE@   python setup_pyjmi.py install --prefix=$(pyjmi_install_dir); \
     1089@PYTHON_ENABLED_TRUE@   rm -rf build
     1090@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cd $(abs_top_srcdir)/Python/src; \
     1091@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     1092@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(PYTHON64_HOME); \
     1093@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    python setup_pyjmi.py install --prefix=$(pyjmi_install_dir64); \
     1094@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PATH="$(ORIG_PATH)"; \
     1095@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
     1096@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -rf build
     1097
    10911098install-python-packages: build-python-packages
    1092     mkdir -p $(DESTDIR)$(prefix)/Python
    1093     cp $(abs_top_srcdir)/Python/src/startup.py $(DESTDIR)$(prefix)/
    1094     cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python/
    1095     [ $(abs_top_srcdir) == $(DESTDIR)$(prefix) ] && echo "Installing in dist directory, don't copy LICENSE file" || cp $(abs_top_srcdir)/Python/LICENSE $(DESTDIR)$(prefix)/Python
    1096 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python_64
    1097 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python_64/
    1098 @JM_WIN64_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
    1099     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1100     if [ -e $(assimulo_install_dir)/$${pkgdir}/site-packages/ ]; \
    1101     then \
    1102     cd $(assimulo_install_dir)/$${pkgdir}/site-packages/; \
    1103     find assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
    1104     fi; \
    1105     done
    1106     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1107     if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
    1108     then \
    1109     cd $(pymodelica_install_dir)/$${pkgdir}/site-packages/; \
    1110     find pymodelica -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
    1111     fi; \
    1112     done
    1113     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1114     if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    1115     then \
    1116     cd $(pyjmi_install_dir)/$${pkgdir}/site-packages/; \
    1117     find pyjmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
    1118     fi; \
    1119     done
    1120     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1121     if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    1122     then \
    1123     cd $(pyfmi_install_dir)/$${pkgdir}/site-packages/; \
    1124     find pyfmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
    1125     fi; \
    1126     done
    1127     cd $(abs_top_srcdir)/Python/src/tests_jmodelica/; \
    1128     mkdir -p $(DESTDIR)$(prefix)/Python/tests_jmodelica; \
    1129     find . -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python/tests_jmodelica
    1130 @JM_WIN64_TRUE@ for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1131 @JM_WIN64_TRUE@ if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
    1132 @JM_WIN64_TRUE@ then \
    1133 @JM_WIN64_TRUE@ cd $(assimulo_install_dir64)/$${pkgdir}/site-packages/; \
    1134 @JM_WIN64_TRUE@ find assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
    1135 @JM_WIN64_TRUE@ fi; \
    1136 @JM_WIN64_TRUE@ done
    1137 @JM_WIN64_TRUE@ for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1138 @JM_WIN64_TRUE@ if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
    1139 @JM_WIN64_TRUE@ then \
    1140 @JM_WIN64_TRUE@ cd $(pymodelica_install_dir64)/$${pkgdir}/site-packages/; \
    1141 @JM_WIN64_TRUE@ find pymodelica -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
    1142 @JM_WIN64_TRUE@ fi; \
    1143 @JM_WIN64_TRUE@ done
    1144 @JM_WIN64_TRUE@ for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1145 @JM_WIN64_TRUE@ if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    1146 @JM_WIN64_TRUE@ then \
    1147 @JM_WIN64_TRUE@ cd $(pyjmi_install_dir64)/$${pkgdir}/site-packages/; \
    1148 @JM_WIN64_TRUE@ find pyjmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
    1149 @JM_WIN64_TRUE@ fi; \
    1150 @JM_WIN64_TRUE@ done
    1151 @JM_WIN64_TRUE@ for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
    1152 @JM_WIN64_TRUE@ if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    1153 @JM_WIN64_TRUE@ then \
    1154 @JM_WIN64_TRUE@ cd $(pyfmi_install_dir64)/$${pkgdir}/site-packages/; \
    1155 @JM_WIN64_TRUE@ find pyfmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
    1156 @JM_WIN64_TRUE@ fi; \
    1157 @JM_WIN64_TRUE@ done
    1158 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ cd $(abs_top_srcdir)/Python/src/tests_jmodelica/; \
    1159 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python_64/tests_jmodelica; \
    1160 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ find . -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64/tests_jmodelica
    1161 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -rf $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/src
    1162 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/CMakeLists.txt
    1163 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/Makefile.am
    1164 @JM_WIN64_TRUE@@WITH_PYTHON64_TRUE@ rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/Makefile.in
    1165     rm -rf $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/src
    1166     rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/CMakeLists.txt
    1167     rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/Makefile.am
    1168     rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/Makefile.in
    1169     mkdir -p $(DESTDIR)$(prefix)/bin
    1170     [ -e $(DESTDIR)$(prefix)/bin/jm_python.sh ] && echo "File exists, don't copy jm_python.sh" || cp Python/jm_python.sh $(DESTDIR)$(prefix)/bin/jm_python.sh
    1171     [ -e $(DESTDIR)$(prefix)/bin/jm_ipython.sh  ] && echo "File exists, don't jm_ipython.sh" || cp Python/jm_ipython.sh $(DESTDIR)$(prefix)/bin/jm_ipython.sh
    1172     chmod ugo+x $(DESTDIR)$(prefix)/bin/jm_*.sh
     1099@PYTHON_ENABLED_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python
     1100@PYTHON_ENABLED_TRUE@   cp $(abs_top_srcdir)/Python/src/startup.py $(DESTDIR)$(prefix)/
     1101@PYTHON_ENABLED_TRUE@   cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python/
     1102@PYTHON_ENABLED_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
     1103@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    mkdir -p $(DESTDIR)$(prefix)/Python_64
     1104@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python_64/
     1105@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
     1106@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1107@PYTHON_ENABLED_TRUE@   if [ -e $(assimulo_install_dir)/$${pkgdir}/site-packages/ ]; \
     1108@PYTHON_ENABLED_TRUE@   then \
     1109@PYTHON_ENABLED_TRUE@   cd $(assimulo_install_dir)/$${pkgdir}/site-packages/; \
     1110@PYTHON_ENABLED_TRUE@   find assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
     1111@PYTHON_ENABLED_TRUE@   fi; \
     1112@PYTHON_ENABLED_TRUE@   done
     1113@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1114@PYTHON_ENABLED_TRUE@   if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
     1115@PYTHON_ENABLED_TRUE@   then \
     1116@PYTHON_ENABLED_TRUE@   cd $(pymodelica_install_dir)/$${pkgdir}/site-packages/; \
     1117@PYTHON_ENABLED_TRUE@   find pymodelica -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
     1118@PYTHON_ENABLED_TRUE@   fi; \
     1119@PYTHON_ENABLED_TRUE@   done
     1120@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1121@PYTHON_ENABLED_TRUE@   if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
     1122@PYTHON_ENABLED_TRUE@   then \
     1123@PYTHON_ENABLED_TRUE@   cd $(pyjmi_install_dir)/$${pkgdir}/site-packages/; \
     1124@PYTHON_ENABLED_TRUE@   find pyjmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
     1125@PYTHON_ENABLED_TRUE@   fi; \
     1126@PYTHON_ENABLED_TRUE@   done
     1127@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1128@PYTHON_ENABLED_TRUE@   if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
     1129@PYTHON_ENABLED_TRUE@   then \
     1130@PYTHON_ENABLED_TRUE@   cd $(pyfmi_install_dir)/$${pkgdir}/site-packages/; \
     1131@PYTHON_ENABLED_TRUE@   find pyfmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python; \
     1132@PYTHON_ENABLED_TRUE@   fi; \
     1133@PYTHON_ENABLED_TRUE@   done
     1134@PYTHON_ENABLED_TRUE@   cd $(abs_top_srcdir)/Python/src/tests_jmodelica/; \
     1135@PYTHON_ENABLED_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/tests_jmodelica; \
     1136@PYTHON_ENABLED_TRUE@   find . -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python/tests_jmodelica
     1137@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1138@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
     1139@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     1140@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    cd $(assimulo_install_dir64)/$${pkgdir}/site-packages/; \
     1141@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    find assimulo -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
     1142@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
     1143@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
     1144@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1145@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
     1146@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     1147@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    cd $(pymodelica_install_dir64)/$${pkgdir}/site-packages/; \
     1148@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    find pymodelica -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
     1149@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
     1150@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
     1151@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1152@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
     1153@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     1154@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    cd $(pyjmi_install_dir64)/$${pkgdir}/site-packages/; \
     1155@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    find pyjmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
     1156@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
     1157@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
     1158@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1159@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
     1160@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     1161@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    cd $(pyfmi_install_dir64)/$${pkgdir}/site-packages/; \
     1162@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    find pyfmi -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64; \
     1163@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
     1164@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
     1165@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cd $(abs_top_srcdir)/Python/src/tests_jmodelica/; \
     1166@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    mkdir -p $(DESTDIR)$(prefix)/Python_64/tests_jmodelica; \
     1167@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    find . -type f |grep -v /.svn | grep -v .pyc | grep -v ~ |tar c -T - -f - | tar x -C $(DESTDIR)$(prefix)/Python_64/tests_jmodelica
     1168@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -rf $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/src
     1169@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/CMakeLists.txt
     1170@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/Makefile.am
     1171@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    rm -f $(DESTDIR)$(prefix)/Python_64/tests_jmodelica/files/Modelica/Resources/Makefile.in
     1172@PYTHON_ENABLED_TRUE@   rm -rf $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/src
     1173@PYTHON_ENABLED_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/CMakeLists.txt
     1174@PYTHON_ENABLED_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/Makefile.am
     1175@PYTHON_ENABLED_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/tests_jmodelica/files/Modelica/Resources/Makefile.in
     1176@PYTHON_ENABLED_TRUE@   mkdir -p $(DESTDIR)$(prefix)/bin
     1177@PYTHON_ENABLED_TRUE@   [ -e $(DESTDIR)$(prefix)/bin/jm_python.sh ] && echo "File exists, don't copy jm_python.sh" || cp Python/jm_python.sh $(DESTDIR)$(prefix)/bin/jm_python.sh
     1178@PYTHON_ENABLED_TRUE@   [ -e $(DESTDIR)$(prefix)/bin/jm_ipython.sh  ] && echo "File exists, don't jm_ipython.sh" || cp Python/jm_ipython.sh $(DESTDIR)$(prefix)/bin/jm_ipython.sh
     1179@PYTHON_ENABLED_TRUE@   chmod ugo+x $(DESTDIR)$(prefix)/bin/jm_*.sh
    11731180
    11741181all-local: build-python-packages build-compiler
     
    13031310
    13041311clean-python-packages:
    1305     if [ -d $(assimulo_build_dir)/Assimulo ]; then \
    1306         cd $(assimulo_build_dir)/Assimulo; \
    1307         python setup.py clean --all --sundials-home=$(SUNDIALS_HOME); \
    1308         cd $(abs_builddir); \
    1309     fi;
    1310     rm -rf $(assimulo_build_dir) || echo  Could not remove $(assimulo_build_dir)
    1311     rm -rf $(assimulo_install_dir) || echo  Could not remove $(assimulo_install_dir)
    1312     -cd $(abs_top_srcdir)/Python/src; \
    1313     python setup_pymodelica.py clean --all
    1314     -rm -rf $(pymodelica_install_dir) || echo  Could not remove $(pymodelica_install_dir)
    1315     if [ -d $(pyfmi_build_dir)/PyFMI ]; then \
    1316         -cd $(pyfmi_build_dir)/PyFMI; \
    1317         python setup.py  clean --all; \
    1318         cd $(abs_builddir); \
    1319     fi;
    1320     -rm -rf $(pyfmi_build_dir) || echo  Could not remove $(pyfmi_build_dir)
    1321     -rm -rf $(pyfmi_install_dir) || echo  Could not remove $(pyfmi_install_dir)
    1322     -cd $(abs_top_srcdir)/Python/src; \
    1323     python setup_pyjmi.py clean --all
    1324     -rm -rf $(pyjmi_install_dir)|| echo  Could not remove $(pyjmi_install_dir)
     1312@PYTHON_ENABLED_TRUE@   if [ -d $(assimulo_build_dir)/Assimulo ]; then \
     1313@PYTHON_ENABLED_TRUE@       cd $(assimulo_build_dir)/Assimulo; \
     1314@PYTHON_ENABLED_TRUE@       python setup.py clean --all --sundials-home=$(SUNDIALS_HOME); \
     1315@PYTHON_ENABLED_TRUE@       cd $(abs_builddir); \
     1316@PYTHON_ENABLED_TRUE@   fi;
     1317@PYTHON_ENABLED_TRUE@   rm -rf $(assimulo_build_dir) || echo  Could not remove $(assimulo_build_dir)
     1318@PYTHON_ENABLED_TRUE@   rm -rf $(assimulo_install_dir) || echo  Could not remove $(assimulo_install_dir)
     1319@PYTHON_ENABLED_TRUE@   -cd $(abs_top_srcdir)/Python/src; \
     1320@PYTHON_ENABLED_TRUE@   python setup_pymodelica.py clean --all
     1321@PYTHON_ENABLED_TRUE@   -rm -rf $(pymodelica_install_dir) || echo  Could not remove $(pymodelica_install_dir)
     1322@PYTHON_ENABLED_TRUE@   if [ -d $(pyfmi_build_dir)/PyFMI ]; then \
     1323@PYTHON_ENABLED_TRUE@       -cd $(pyfmi_build_dir)/PyFMI; \
     1324@PYTHON_ENABLED_TRUE@       python setup.py  clean --all; \
     1325@PYTHON_ENABLED_TRUE@       cd $(abs_builddir); \
     1326@PYTHON_ENABLED_TRUE@   fi;
     1327@PYTHON_ENABLED_TRUE@   -rm -rf $(pyfmi_build_dir) || echo  Could not remove $(pyfmi_build_dir)
     1328@PYTHON_ENABLED_TRUE@   -rm -rf $(pyfmi_install_dir) || echo  Could not remove $(pyfmi_install_dir)
     1329@PYTHON_ENABLED_TRUE@   -cd $(abs_top_srcdir)/Python/src; \
     1330@PYTHON_ENABLED_TRUE@   python setup_pyjmi.py clean --all
     1331@PYTHON_ENABLED_TRUE@   -rm -rf $(pyjmi_install_dir)|| echo  Could not remove $(pyjmi_install_dir)
    13251332
    13261333clean-frontends:
  • branches/dev-5726-orginal-annotation/configure

    r11950 r12304  
    654654CASADI_HOME
    655655WITH_CASADI
     656PYTHON_ENABLED_FALSE
     657PYTHON_ENABLED_TRUE
    656658IPOPT64_HOME
    657659IPOPT64_LIB
     
    806808with_ipopt
    807809with_ipopt64
     810enable_python
    808811with_casadi
    809812with_mingw
     
    14541457                          optimize for fast installation [default=yes]
    14551458  --disable-libtool-lock  avoid locking (might break parallel builds)
     1459  --enable-python         use --enable-python=no to remove python modules from
     1460                          build
    14561461
    14571462Optional Packages:
     
    1911719122
    1911819123
     19124#------------- Configure python packages into build ----------------------------
     19125
     19126# Check whether --enable-python was given.
     19127if test "${enable_python+set}" = set; then :
     19128  enableval=$enable_python; python=${enableval}
     19129else
     19130  python=yes
     19131fi
     19132
     19133
     19134 if test "$python" = "yes"; then
     19135  PYTHON_ENABLED_TRUE=
     19136  PYTHON_ENABLED_FALSE='#'
     19137else
     19138  PYTHON_ENABLED_TRUE='#'
     19139  PYTHON_ENABLED_FALSE=
     19140fi
     19141
     19142if test "$python" = "yes"; then
     19143        echo configure: Python modules are enabled
     19144else
     19145        echo configure: Python modules are disabled
     19146fi
     19147
     19148
     19149#-----------------------------------------
     19150
    1911919151if test "x$with_casadi" != xno; then :
    1912019152  WITH_CASADI="true"
     
    1991519947if test -z "${COMPILE_WITH_IPOPT64_TRUE}" && test -z "${COMPILE_WITH_IPOPT64_FALSE}"; then
    1991619948  as_fn_error $? "conditional \"COMPILE_WITH_IPOPT64\" was never defined.
     19949Usually this means the macro was only invoked conditionally." "$LINENO" 5
     19950fi
     19951if test -z "${PYTHON_ENABLED_TRUE}" && test -z "${PYTHON_ENABLED_FALSE}"; then
     19952  as_fn_error $? "conditional \"PYTHON_ENABLED\" was never defined.
    1991719953Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1991819954fi
  • branches/dev-5726-orginal-annotation/configure.ac

    r11950 r12304  
    214214IPOPT_ARG_CHECK([ipopt64], [with-ipopt64], [with_ipopt64], [IPOPT64], [IPOPT64_INC], [IPOPT64_LIB], [IPOPT64_HOME], [COMPILE_WITH_IPOPT64])
    215215
     216
     217#------------- Configure python packages into build ----------------------------
     218
     219AC_ARG_ENABLE([python],
     220  AS_HELP_STRING([--enable-python], [ use --enable-python=no to remove python modules from build]),
     221  [python=${enableval}],
     222  [python=yes])
     223
     224AM_CONDITIONAL(PYTHON_ENABLED, test "$python" = "yes")
     225if test "$python" = "yes"; then
     226        echo configure: Python modules are enabled
     227else
     228        echo configure: Python modules are disabled
     229fi
     230
     231
     232#-----------------------------------------
    216233AC_SUBST(WITH_CASADI)
    217234AS_IF([test "x$with_casadi" != xno],
Note: See TracChangeset for help on using the changeset viewer.