- Patch MSL 2.2.2 for 32-bit platforms

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15755 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Makefile.common

@@ -195,19 +195,26 @@ susan: all sustst
 sustst:
 	(cd Compiler/susan_codegen && $(MAKE) -f Makefile test)
 
-OMLIBRARY_INTERNAL_DIRS=BioChem?1.0 Modelica?1.6 Modelica?2.2.2 ModelicaAdditions Modelica?3.1 ModelicaServices?1.0 ModelicaServices?1.0?modelica3d Modelica_LinearSystems2?2.3 SimpleFluid
+OMLIBRARY_INTERNAL_DIRS=BioChem?1.0 Modelica?1.6 ModelicaAdditions Modelica?3.1 ModelicaServices?1.0 ModelicaServices?1.0?modelica3d Modelica_LinearSystems2?2.3 SimpleFluid
 
 omlibrary: build/lib/omlibrary/stamp modelica3d
 	echo "Windows-1252" > "build/lib/omlibrary/Modelica 2.2.2/package.encoding"
 build/lib/omlibrary/stamp: libraries/README
 	rm -rf build/lib/omlibrary
 	install -m755 -d "build/lib/omlibrary/Modelica 3.2.1" "build/lib/omlibrary/ModelicaServices 3.2.1" "build/lib/omlibrary/ModelicaReference 3.2.1" "build/lib/omlibrary/ModelicaTest 1.1"
 	@# services3d target includes the services target
-	$(MAKE) -f $(defaultMakefileTarget) omlibrary-internal omlibrary-32 omlibrary-services3d omlibrary-reference omlibrary-test
+	$(MAKE) -f $(defaultMakefileTarget) omlibrary-internal omlibrary-32 omlibrary-services3d omlibrary-reference omlibrary-test omlibrary-222
 	touch $@
 omlibrary-internal:
 	(cd libraries/ && find $(OMLIBRARY_INTERNAL_DIRS) -type d -not -path "*svn*" -exec install -m755 -d ../build/lib/omlibrary/{} \;)
 	(cd libraries/ && find $(OMLIBRARY_INTERNAL_DIRS) -type f -not -path "*svn*" -exec install -p -m644 {} ../build/lib/omlibrary/{} \;)
+
+omlibrary-222:
+	(cd "libraries/Modelica 2.2.2" && find . -type d -not -path "*svn*" -exec install -m755 -d "../../build/lib/omlibrary/Modelica 2.2.2/{}" \;)
+	(cd "libraries/Modelica 2.2.2" && find . -type f -not -path "*svn*" -exec install -m644 {} "../../build/lib/omlibrary/Modelica 2.2.2/{}" \;)
+	patch -d build/lib/omlibrary -p3 < "libraries/Modelica 2.2.2.patch"
+	find "build/lib/omlibrary/Modelica 2.2.2" -name "*.orig" -exec rm -f "{}" ";"
+
 omlibrary-32:
 	(cd "libraries/Modelica 3.2.1/Modelica" && find . -type d -not -path "*svn*" -exec install -m755 -d "../../../build/lib/omlibrary/Modelica 3.2.1/{}" \;)
 	(cd "libraries/Modelica 3.2.1/Modelica" && find . -type f -not -path "*svn*" -exec install -p -m644 {} "../../../build/lib/omlibrary/Modelica 3.2.1/{}" \;)
@@ -239,10 +246,13 @@ omlibrary-services3d: omlibrary-services
 	find "build/lib/omlibrary/ModelicaServices 3.2.1 modelica3d" -name "*.orig" -exec rm -f "{}" ";"
 
 # Run this command to update the omlibrary patch. Add more libraries as needed
-omlibrary-diff:
+omlibrary-msl321-diff:
 	diff -u -x .svn -r "libraries/Modelica 3.2.1/Modelica" "build/lib/omlibrary/Modelica 3.2.1" > "libraries/Modelica 3.2.1.patch" || echo "*** Modelica 3.2.1 has patch"
+omlibrary-services321-diff:
 	diff -u -x .svn -r "libraries/Modelica 3.2.1/ModelicaServices/" "build/lib/omlibrary/ModelicaServices 3.2.1" > "libraries/ModelicaServices 3.2.1.patch" || echo "*** ModelicaServices 3.2.1 has patch"
 	diff -u -x .svn -r "build/lib/omlibrary/ModelicaServices 3.2.1/package.mo" "build/lib/omlibrary/ModelicaServices 3.2.1 modelica3d/package.mo" > "libraries/ModelicaServices 3.2.1 modelica3d.patch" || echo "*** ModelicaServices 3.2.1 modelica3d has patch"
+omlibrary-msl222-diff:
+	diff -u -x .svn -r "libraries/Modelica 2.2.2/" "build/lib/omlibrary/Modelica 2.2.2" > "libraries/Modelica 2.2.2.patch" || echo "*** Modelica 2.2.2 has patch"
 
 distclean: clean
 	(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) reallyclean)