[Mobies-commit] [commit] r4208 - in UDM/trunk: . bin rpm samples/cross_links scripts tests/test_crosslinks
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Fri Dec 6 14:09:41 CST 2013
Author: endre
Date: Fri Dec 6 14:09:40 2013
New Revision: 4208
Log:
Revert "- Modified and fixed some errors in automake and autoconfigure files so Linux build"
This reverts commit 2cc591b30b12ef8151e0d5f906c8e2be2548e838.
Added:
UDM/trunk/samples/cross_links/CL.udm
UDM/trunk/samples/cross_links/CL_export.xml
Modified:
UDM/trunk/Linux_build.txt
UDM/trunk/Makefile.am
UDM/trunk/bin/Makefile.am
UDM/trunk/rpm/Makefile.am
UDM/trunk/rpm/udm.spec.in
UDM/trunk/scripts/_archive-model-files.bat
UDM/trunk/tests/test_crosslinks/CrossLinkTester.cpp
UDM/trunk/tests/test_crosslinks/Makefile.am
Modified: UDM/trunk/Linux_build.txt
==============================================================================
--- UDM/trunk/Linux_build.txt Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/Linux_build.txt Fri Dec 6 14:09:40 2013 (r4208)
@@ -1,163 +1,116 @@
-HOWTO install Udm from ISIS repos:
-
-CentOS 5.8:
-----------
-On CentOS 5, ISIS Udm packages require python-hashlib from EPEL:
- Enable EPEL repository: http://fedoraproject.org/wiki/EPEL:
- wget http://mirror.utexas.edu/epel/5/i386/epel-release-5-4.noarch.rpm
- rpm -i epel-release-5-4.noarch.rpm
- yum install -y python-hashlib
-cat > /etc/yum.repos.d/isis.repo <<EOF
-[isis]
-name=ISIS \$releasever - \$basearch
-baseurl=http://repo.isis.vanderbilt.edu/Download/UDM/rhel/\$releasever/\$basearch/
-enabled=1
-gpgcheck=0
-EOF
-
-yum install -y udm
-
-
-Software requirements and instructions to compile UDM source files on Linux
-
-Building:
----------
-
-Requirements:
--------------
-- GCC 3.x (or later)
-- Xerces-C++ 2.5.0 (or later)
-- Xalan-C++ 1.8.0 (or later)
-- SWIG 1.3.23 (or later)
-- minizip
-- cppunit
-- pccts
-- gcc-java 4.x (or later) or Java SDK 1.4.2 (or later)
-- ant
-- junit
-- Boost
-- libboost-python-dev for UdmPython (apt-get install libboost-python-dev)
-
-Build-environment preparation (Fedora 14 or newer):
-----------------------------------------------
-- install development tools and libraries
- yum groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
- yum install ccache cppunit-devel minizip-devel swig xalan-c-devel xerces-c-devel
- yum install ant ant-junit ant-trax junit xerces-j2 xalan-j2 xml-commons-apis
-- install the following rpm from our repository or disable antlr: pccts, minzip, minizip-lib, minizip-devel
- (pccts-1.33mr33-13.2.fc5.1.i386.rpm, minizip-1.01e-1.fc6.1.i386.rpm, minizip-devel-1.01e-1.fc6.1.i386.rpm, minizip-libs-1.01e-1.fc6.1.i386.rpm)
-
-Build-environment preparation (RHEL/CentOS 5):
-----------------------------------------------
-- enable EPEL repository: http://fedoraproject.org/wiki/EPEL
-- install development tools and libraries
- yum groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
- yum install -y ccache cppunit-devel swig xalan-c-devel xerces-c-devel
- yum install -y ant ant-junit ant-trax junit xerces-j2 xalan-j2 xml-commons-apis
- yum install -y java-1.6.0-openjdk java-1.6.0-openjdk-devel
-- install the following rpms from our repository:
- yum install -y minizip minizip-devel minizip-libs pccts
-
-Obtaining model-files.zip:
---------------------------
-From scratch:
- - build udm, judm and the tests on Windows: msbuild make.msbuild /t:BuildVS9;judm
- - on Windows run %UDM_PATH%\scripts\archive-model-files.bat, it will
- create %UDM_PATH%\model-files-*.zip, an archive with the model data
- files generated on Windows
- - Copy the archive model-files-*.zip and rename it to model-files.zip.
-
-From build.isis:
-wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
-
-Building:
----------------------
-- on Linux export or checkout the Udm sources from subversion repository
-- in the top directory run
- autoreconf -i
-- Obtain model-files.zip as above
-- Save model-files.zip in the top directory of your build directory
-- configure and build Udm with the usual sequence of steps for GNU autotools:
- ./configure (for RHEL/CentOS and Fedora: ./configure --with-antlr=antlr1)
- make
-- to run the tests launch the following command in the top build directory:
- make check
-- to build the binary and source rpms launch the following command in
- the top build directory:
- make rpms (for Ubuntu, use alien to convert the rpm-s to deb packages)
-
-Building on Ubuntu 10.04 (Lucid):
-----------------------------------------------
-# Install Build-Deps:
-sudo apt-get install debhelper build-essential autoconf libtool ccache libcppunit-dev libxalan110-dev ant junit libxerces-c2-dev sun-java6-jdk ant-optional pccts libboost-dev zlib1g-dev swig libboost-python-dev alien
-# Configure alternatives to use java-6-sun
-sudo update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java
-sudo update-java-alternatives -s java-6-sun
-# Install the following rpm from our repository or disable antlr: minzip, minizip-lib, minizip-devel
-alien --install minizip-1.01e-1.fc6.1.i386.rpm
-alien --install minizip-devel-1.01e-1.fc6.1.i386.rpm
-alien --install minizip-libs-1.01e-1.fc6.1.i386.rpm
-# Obtain model-files.zip as above or:
-wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
-# Build binary debs // this will not work at the moment
-#fakeroot debian/rules binary
-# Configure and build Udm with the usual sequence of steps for GNU autotools, at top build directory:
-autoreconf -i
-./configure
-make
-# Run the tests:
-make check
-# If check fails, then:
-# 1) Make sure minizip library links are there in the source, if not, create them:
-#ln -s ../../debian/zlib-1.2.3.3.dfsg/contrib/minizip src/Udm/minizip
-#ln -s ../../debian/zlib-1.2.3.3.dfsg/contrib/minizip src/UdmBase/minizip
-# 2) Aslo make sure that the jdk library is included so the gcc knows it:
-#JNI_PATH = find / -type f -name 'jni.h' | sed 's/jni.h//1'
-#export CPATH=$CPATH:$JNI_PATH
-# Build binary and source rpms:
-make rpms
-# Convert the needed rpms from rpm/RMPS/$(ARCH)/ where
-#$(ARCH) is the architecture of the computer and
-#$(filename) is desired package (eg. if development or java distribution is needed)
-alien --scripts $(filename)
-
-Building on Ubuntu 12.04 (Precise):
-----------------------------------------------
-sudo apt-get install fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev alien
-# Install the following rpm from our repository or disable antlr: minzip, minizip-lib, minizip-devel
-alien --install minizip-1.01e-1.fc6.1.i386.rpm
-alien --install minizip-devel-1.01e-1.fc6.1.i386.rpm
-alien --install minizip-libs-1.01e-1.fc6.1.i386.rpm
-# Obtain model-files.zip as above or:
-wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
-# Build binary debs // this will not work at the moment
-#fakeroot debian/rules binary
-# Configure and build Udm with the usual sequence of steps for GNU autotools, at top build directory:
-autoreconf -i
-./configure
-make
-# Run the tests:
-make check
-# If check fails, then:
-# 1) Make sure minizip library links are there in the source, if not, create them:
-#ln -s ../../debian/zlib-1.2.3.3.dfsg/contrib/minizip src/Udm/minizip
-#ln -s ../../debian/zlib-1.2.3.3.dfsg/contrib/minizip src/UdmBase/minizip
-# 2) Aslo make sure that the jdk library is included so the gcc knows it:
-#JNI_PATH = find / -type f -name 'jni.h' | sed 's/jni.h//1'
-#export CPATH=$CPATH:$JNI_PATH
-# Build binary and source rpms:
-make rpms
-# Convert the needed rpms from rpm/RMPS/$(ARCH)/ where
-#$(ARCH) is the architecture of the computer and
-#$(filename) is desired package (eg. if development or java distribution is needed)
-alien --scripts $(filename)
-
-Building (CentOS)
-----------------------------------------------
-- CentOS <6: enable RPMForge repository: http://wiki.centos.org/AdditionalResources/Repositories/RPMForge
- yum -y groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
- yum -y install ccache cppunit-devel xerces-c-devel swig ant-junit boost-devel antlr
- setenforce permissive
- wget -O model-files.zip http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip
- autoreconf -i
- cd rpmbuild_CentOS && bash make.sh
+HOWTO install Udm from ISIS repos:
+
+CentOS 5.8:
+----------
+On CentOS 5, ISIS Udm packages require python-hashlib from EPEL:
+ Enable EPEL repository: http://fedoraproject.org/wiki/EPEL:
+ wget http://mirror.utexas.edu/epel/5/i386/epel-release-5-4.noarch.rpm
+ rpm -i epel-release-5-4.noarch.rpm
+ yum install -y python-hashlib
+cat > /etc/yum.repos.d/isis.repo <<EOF
+[isis]
+name=ISIS \$releasever - \$basearch
+baseurl=http://repo.isis.vanderbilt.edu/Download/UDM/rhel/\$releasever/\$basearch/
+enabled=1
+gpgcheck=0
+EOF
+
+yum install -y udm
+
+
+Software requirements and instructions to compile UDM source files on Linux
+
+Building:
+---------
+
+Requirements:
+-------------
+- GCC 3.x (or later)
+- Xerces-C++ 2.5.0 (or later)
+- Xalan-C++ 1.8.0 (or later)
+- SWIG 1.3.23 (or later)
+- minizip
+- cppunit
+- pccts
+- gcc-java 4.x (or later) or Java SDK 1.4.2 (or later)
+- ant
+- junit
+- Boost
+- libboost-python-dev for UdmPython (apt-get install libboost-python-dev)
+
+Build-environment preparation (Fedora 14 or newer):
+----------------------------------------------
+- install development tools and libraries
+ yum groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
+ yum install ccache cppunit-devel minizip-devel swig xalan-c-devel xerces-c-devel
+ yum install ant ant-junit ant-trax junit xerces-j2 xalan-j2 xml-commons-apis
+- install the following rpm from our repository or disable antlr: pccts
+
+Build-environment preparation (RHEL/CentOS 5):
+----------------------------------------------
+- enable EPEL repository: http://fedoraproject.org/wiki/EPEL
+- install development tools and libraries
+ yum groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
+ yum install -y ccache cppunit-devel swig xalan-c-devel xerces-c-devel
+ yum install -y ant ant-junit ant-trax junit xerces-j2 xalan-j2 xml-commons-apis
+ yum install -y java-1.6.0-openjdk java-1.6.0-openjdk-devel
+- install the following rpms from our repository:
+ yum install -y minizip minizip-devel minizip-libs pccts
+
+Obtaining model-files.zip:
+--------------------------
+From scratch:
+ - build udm, judm and the tests on Windows: msbuild make.msbuild /t:BuildVS9;judm
+ - on Windows run %UDM_PATH%\scripts\archive-model-files.bat, it will
+ create %UDM_PATH%\model-files-*.zip, an archive with the model data
+ files generated on Windows
+ - Copy the archive model-files-*.zip and rename it to model-files.zip.
+
+From build.isis:
+wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
+
+Building:
+---------------------
+- on Linux export or checkout the Udm sources from subversion repository
+- in the top directory run
+ autoreconf -i
+- Obtain model-files.zip as above
+- Save model-files.zip in the top directory of your build directory
+- configure and build Udm with the usual sequence of steps for GNU autotools:
+ ./configure (for RHEL/CentOS and Fedora: ./configure --with-antlr=antlr1)
+ make
+- to run the tests launch the following command in the top build directory:
+ make check
+- to build the binary and source rpms launch the following command in
+ the top build directory:
+ make rpms
+
+Building on Ubuntu 10.04 (Lucid):
+----------------------------------------------
+# Install Build-Deps:
+sudo apt-get install debhelper build-essential autoconf libtool ccache libcppunit-dev libxalan110-dev ant junit libxerces-c2-dev sun-java6-jdk ant-optional pccts libboost-dev zlib1g-dev swig libboost-python-dev
+# Configure alternatives to use java-6-sun
+sudo update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java
+sudo update-java-alternatives -s java-6-sun
+# Obtain model-files.zip as above or:
+wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
+# Build binary debs
+fakeroot debian/rules binary
+
+Building on Ubuntu 12.04 (Precise):
+----------------------------------------------
+sudo apt-get install fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev
+# Obtain model-files.zip as above or:
+wget 'http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip' -O model-files.zip
+# Build binary debs
+fakeroot debian/rules binary
+
+Building (CentOS)
+----------------------------------------------
+- CentOS <6: enable RPMForge repository: http://wiki.centos.org/AdditionalResources/Repositories/RPMForge
+ yum -y groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
+ yum -y install ccache cppunit-devel xerces-c-devel swig ant-junit boost-devel antlr
+ setenforce permissive
+ wget -O model-files.zip http://build.isis.vanderbilt.edu/job/UDM/label=build-slave3/lastSuccessfulBuild/artifact/trunk/model-files-VC9-Release.zip
+ autoreconf -i
+ cd rpmbuild_CentOS && bash make.sh
Modified: UDM/trunk/Makefile.am
==============================================================================
--- UDM/trunk/Makefile.am Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/Makefile.am Fri Dec 6 14:09:40 2013 (r4208)
@@ -4,14 +4,7 @@
SUBDIRS = . doc etc include src lib bin samples tests judm rpm
EXTRA_DIST = CHANGELOG.txt license.txt Linux_build.txt \
- model-files.zip readme.txt releaseinfo.txt \
- samples/CL_udm.udm samples/cross_links/CL_udm.udm \
- samples/LampDiagram_udm.xml samples/cross_links/CL_export.xml \
- tests/test_ns/CL_udm.udm tests/test_crosslinks/CL_udm.udm \
- tests/testGetAdjacentObjects/testAssociationScenarios_udm.udm \
- tests/test_ns/test_ns_udm.xml tests/test_refports/RefPort_udm.xml \
- tests/testUdmCint/GeneTF_udm.xml tests/testUdmCint/SBML2Ex_udm.xml \
- tests/testOCL/SBML2_udm.xml
+ model-files.zip readme.txt releaseinfo.txt
all-local: model-files.zip
unzip -x -o $(srcdir)/model-files.zip
Modified: UDM/trunk/bin/Makefile.am
==============================================================================
--- UDM/trunk/bin/Makefile.am Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/bin/Makefile.am Fri Dec 6 14:09:40 2013 (r4208)
@@ -17,8 +17,7 @@
Udm_SOURCES =
Udm_LDADD = \
../src/Udm/libudm.la \
- ../lib/libudm.la \
- -lminizip -lz
+ ../lib/libudm.la
nodist_EXTRA_Udm_SOURCES = dummy.cxx
Modified: UDM/trunk/rpm/Makefile.am
==============================================================================
--- UDM/trunk/rpm/Makefile.am Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/rpm/Makefile.am Fri Dec 6 14:09:40 2013 (r4208)
@@ -1,19 +1,19 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-
-ARCH = $(shell uname -i)
-
-rpms: RPMS/$(ARCH)/udm- at PACKAGE_VERSION@-0localbuild.$(ARCH).rpm SRPMS/udm- at PACKAGE_VERSION@-0localbuild.srpm
-
-RPMS/$(ARCH)/udm- at PACKAGE_VERSION@-0localbuild.$(ARCH).rpm: prepare_build_env
- rpmbuild --target i686 --define "_topdir `pwd`" -bb SPECS/udm.spec
-
-SRPMS/udm- at PACKAGE_VERSION@-0localbuild.srpm: prepare_build_env
- rpmbuild --target i686 --define "_topdir `pwd`" -bs SPECS/udm.spec
-
-prepare_build_env: udm.spec
- mkdir -p RPMS/$(ARCH) BUILD SOURCES SPECS SRPMS
- cp udm.spec SPECS
- (cd .. && make dist && mv udm- at PACKAGE_VERSION@.tar.gz rpm/SOURCES)
-
-clean:
- rm -rf BUILD RPMS SOURCES SPECS SRPMS
+## Makefile.am -- Process this file with automake to produce Makefile.in
+
+ARCH = $(shell uname -i)
+
+rpms: RPMS/$(ARCH)/udm- at PACKAGE_VERSION@-0localbuild.$(ARCH).rpm SRPMS/udm- at PACKAGE_VERSION@-0localbuild.srpm
+
+RPMS/$(ARCH)/udm- at PACKAGE_VERSION@-0localbuild.$(ARCH).rpm: prepare_build_env
+ rpmbuild --define "_topdir `pwd`" -bb SPECS/udm.spec
+
+SRPMS/udm- at PACKAGE_VERSION@-0localbuild.srpm: prepare_build_env
+ rpmbuild --define "_topdir `pwd`" -bs SPECS/udm.spec
+
+prepare_build_env: udm.spec
+ mkdir -p RPMS/$(ARCH) BUILD SOURCES SPECS SRPMS
+ cp udm.spec SPECS
+ (cd .. && make dist && mv udm- at PACKAGE_VERSION@.tar.gz rpm/SOURCES)
+
+clean:
+ rm -rf BUILD RPMS SOURCES SPECS SRPMS
Modified: UDM/trunk/rpm/udm.spec.in
==============================================================================
--- UDM/trunk/rpm/udm.spec.in Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/rpm/udm.spec.in Fri Dec 6 14:09:40 2013 (r4208)
@@ -9,14 +9,14 @@
Source: %{name}-%{version}.tar.gz
#Source1: model-files.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Packager: ISIS (Institute for Software Integrated Systems), Vanderbilt University, http://www.isis.vanderbilt.edu
+Packager: Endre Magyari <endre at nextra.ro>
License: Vanderbilt University EULA
-#BuildRequires: xerces-c-devel, xalan-c-devel, minizip-devel, pccts
-#BuildRequires: swig >= 1.3.24, cppunit-devel
-#BuildRequires: ant, ant-junit, ant-trax, junit, xml-commons-apis
-#BuildRequires: java-devel
-#BuildRequires: boost-devel
-#Requires: xerces-c, xalan-c, minizip-libs
+BuildRequires: xerces-c-devel, xalan-c-devel, minizip-devel, pccts
+BuildRequires: swig >= 1.3.24, cppunit-devel
+BuildRequires: ant, ant-junit, ant-trax, junit, xml-commons-apis
+BuildRequires: java-devel
+BuildRequires: boost-devel
+Requires: xerces-c, xalan-c, minizip-libs
%if "%{rhldisttag}" == "rh7"
BuildRequires: gcc3-c++
%endif
@@ -50,6 +50,7 @@
%prep
%setup -q
+#%setup -a 1 -D -q
%build
%if "%{rhldisttag}" == "rh7"
@@ -60,6 +61,7 @@
%configure --enable-static --with-swig=%{swig} --with-antlr=%{antlr}
make %{_smp_mflags}
+#%check
make check
%install
@@ -78,14 +80,11 @@
# java samples
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java
-
-
for sample in GeneTF GeneTRE SBML2Ex TimeSeries; do
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
- cp -pr /home/palfi/Prj/UDM/trunk_actual/judm/build/build_linux/$sample/ $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
+ cp -pr judm/build/build_linux/$sample/{apidoc,*.jar,meta,runtests.sh,samples} $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
done
-
%postun
/sbin/ldconfig
@@ -100,7 +99,6 @@
%doc doc/*.pdf
%{_bindir}/*
%{_libdir}/libudm.so.*
-/usr/lib/libudmxmi.so*
# judm loads libUdmSwig.so, include it here
%{_libdir}/libUdmSwig.so*
%{_datadir}/%{name}/etc
@@ -110,7 +108,6 @@
%{_includedir}/%{name}
%{_libdir}/*.*a
%{_libdir}/libudm.so
-/usr/lib/libudmxmi.so*
%{_datadir}/%{name}/samples/LampDiagram_udm.xml
%{_datadir}/%{name}/samples/CreateLampModel
%{_datadir}/%{name}/samples/cross_links
Added: UDM/trunk/samples/cross_links/CL.udm
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and UDM/trunk/samples/cross_links/CL.udm Fri Dec 6 14:09:40 2013 (r4208) differ
Added: UDM/trunk/samples/cross_links/CL_export.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/samples/cross_links/CL_export.xml Fri Dec 6 14:09:40 2013 (r4208)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project SYSTEM "mga.dtd">
+
+<project guid="{00000000-0000-0000-0000-000000000000}" cdate="Thu Aug 21 09:22:02 2003" mdate="Thu Sep 04 20:25:54 2003" metaguid="{DA44B836-DEAD-BEEF-FEED-DAD000000001}" metaname="UML">
+ <name>CL</name>
+ <comment></comment>
+ <author></author>
+ <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x4" kind="RootFolder">
+ <name>CL</name>
+ <folder id="id-006a-00000004" relid="0x4" childrelidcntr="0x1" kind="Package">
+ <name>CD3</name>
+ <model id="id-0065-00000003" kind="ClassDiagram" relid="0x1" childrelidcntr="0x5">
+ <name>CD3</name>
+ <connection id="id-0068-00000016" kind="Sub" role="Sub" relid="0x5">
+ <name>Sub</name>
+ <connpoint role="dst" target="id-0066-00000012"/>
+ <connpoint role="src" target="id-0066-00000011"/>
+ </connection>
+ <connection id="id-0068-00000015" kind="Base" role="Base" relid="0x4">
+ <name>Base</name>
+ <connpoint role="dst" target="id-0066-00000011"/>
+ <connpoint role="src" target="id-0066-00000010"/>
+ </connection>
+ <atom id="id-0066-00000012" kind="Class" role="Class" relid="0x3">
+ <name>MM3</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>160,154</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>205,156</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ </atom>
+ <atom id="id-0066-00000011" kind="Inheritance" role="Inheritance" relid="0x2">
+ <name>Inheritance</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>212,114</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>212,114</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ </atom>
+ <atom id="id-0066-00000010" kind="Class" role="Class" relid="0x1">
+ <name>M3</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>211,42</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>198,149</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ </atom>
+ </model>
+ </folder>
+ <folder id="id-006a-00000003" relid="0x2" childrelidcntr="0x1" kind="Package">
+ <name>CD2</name>
+ <model id="id-0065-00000002" kind="ClassDiagram" relid="0x1" childrelidcntr="0x1a">
+ <name>CD2</name>
+ <atom id="id-0066-00000002" kind="Class" role="Class" relid="0x4">
+ <name>M2</name>
+ <regnode name="PartRegs" isopaque="yes">
+ <value></value>
+ <regnode name="UML" isopaque="yes">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>120,126</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints" isopaque="yes">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>37,23</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ </atom>
+ </model>
+ </folder>
+ <folder id="id-006a-00000002" relid="0x1" childrelidcntr="0x1" kind="Package">
+ <name>CD1</name>
+ <model id="id-0065-00000001" kind="ClassDiagram" relid="0x1" childrelidcntr="0x2f">
+ <name>CD1</name>
+ <reference id="id-0067-00000004" kind="ClassCopy" role="ClassCopy" relid="0x1d" referred="id-0066-00000010">
+ <name>M3</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>246,84</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>282,37</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <reference id="id-0067-00000003" kind="ClassCopy" role="ClassCopy" relid="0x1c" referred="id-0066-00000002">
+ <name>M2</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>183,28</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>51,44</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <connection id="id-0068-0000000f" kind="AssociationClass" role="AssociationClass" relid="0x21">
+ <name>AssociationClass</name>
+ <connpoint role="dst" target="id-0066-00000001"/>
+ <connpoint role="src" target="id-0066-00000006"/>
+ </connection>
+ <connection id="id-0068-0000000e" kind="Dst" role="Dst" relid="0x20">
+ <name>Dst</name>
+ <attribute kind="Cardinality">
+ <value>1</value>
+ </attribute>
+ <attribute kind="dstRolename" status="meta">
+ <value>dst</value>
+ </attribute>
+ <connpoint role="dst" target="id-0067-00000004"/>
+ <connpoint role="src" target="id-0066-00000006"/>
+ </connection>
+ <connection id="id-0068-0000000d" kind="Src" role="Src" relid="0x1f">
+ <name>Src</name>
+ <attribute kind="Cardinality" status="meta">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="srcRolename" status="meta">
+ <value>src</value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-00000006"/>
+ <connpoint role="src" target="id-0067-00000003"/>
+ </connection>
+ <atom id="id-0066-00000006" kind="Connector" role="Connector" relid="0x1e">
+ <name>Connector</name>
+ <regnode name="PartRegs">
+ <value></value>
+ <regnode name="UML">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>194,103</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ </atom>
+ <atom id="id-0066-00000001" kind="Class" role="Class" relid="0xe">
+ <name>M1</name>
+ <regnode name="PartRegs" isopaque="yes">
+ <value></value>
+ <regnode name="Constraints" isopaque="yes">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>37,37</value>
+ </regnode>
+ </regnode>
+ <regnode name="UML" isopaque="yes">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>183,140</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ </atom>
+ </model>
+ </folder>
+ </folder>
+</project>
Modified: UDM/trunk/scripts/_archive-model-files.bat
==============================================================================
--- UDM/trunk/scripts/_archive-model-files.bat Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/scripts/_archive-model-files.bat Fri Dec 6 14:09:40 2013 (r4208)
@@ -20,12 +20,4 @@
zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip judm -i *_udm.xml -i *_udm.udm -x judm/build/*
popd
-pushd %_UDM_PATH%
-zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip tests -i *_udm.xml -i *_udm.udm
-popd
-
-pushd %_UDM_PATH%
-zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip samples -i *_udm.xml -i *_udm.udm
-popd
-
exit /b
Modified: UDM/trunk/tests/test_crosslinks/CrossLinkTester.cpp
==============================================================================
--- UDM/trunk/tests/test_crosslinks/CrossLinkTester.cpp Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/tests/test_crosslinks/CrossLinkTester.cpp Fri Dec 6 14:09:40 2013 (r4208)
@@ -1,17 +1,13 @@
#include "CrossLinkTester.h"
-//#include "CLPackage.h"
+#include "CLPackage.h"
#include "CL.h"
-#include "CD1.h"
-#include "CD2.h"
-#include "CD3.h"
+#include "Package1.h"
+#include "Package2.h"
CPPUNIT_TEST_SUITE_REGISTRATION( UdmTests::CrossLinkTester );
-//using namespace Package1;
-//using namespace Package2;
-using namespace CD1;
-using namespace CD2;
-using namespace CD3;
+using namespace Package1;
+using namespace Package2;
using namespace std;
void UdmTests::CrossLinkTester::test()
@@ -19,59 +15,38 @@
try {
Udm::UdmProject prj;
//specifying instance data networks which will be present in the project
- Udm::DataNetworkSpecifier cd1_dn("CD1_inst.xml", "CD1", M1::meta);
- Udm::DataNetworkSpecifier cd2_dn("CD2_inst.xml", "CD2", M2::meta);
- Udm::DataNetworkSpecifier cd3_dn("CD3_inst.xml", "CD3", MM3::meta);
- //Udm::DataNetworkSpecifier BdnsP1("Package1_inst.xml", "CD1", ClassA::meta);
- //Udm::DataNetworkSpecifier dnsP2("Package2_inst.xml", "CD2", Class1::meta);
+ Udm::DataNetworkSpecifier dnsP1("Package1_inst.xml", "Package1", ClassA::meta);
+ Udm::DataNetworkSpecifier dnsP2("Package2_inst.xml", "Package2", Class1::meta);
vector<Udm::DataNetworkSpecifier> dnsvec;
- dnsvec.push_back(cd1_dn);
- dnsvec.push_back(cd2_dn);
- dnsvec.push_back(cd3_dn);
+ dnsvec.push_back(dnsP1);
+ dnsvec.push_back(dnsP2);
//creating a Udm Project
prj.CreateNew("test.udm", dnsvec, CL::diagram, Udm::CHANGES_LOST_DEFAULT);
//obtaining handles to the datanetworks which were created
- Udm::DataNetwork& p1 = prj.GetDataNetwork("CD1_inst.xml");
- Udm::DataNetwork& p2 = prj.GetDataNetwork("CD2_inst.xml");
- Udm::DataNetwork& p3 = prj.GetDataNetwork("CD3_inst.xml");
+ Udm::DataNetwork& p1 = prj.GetDataNetwork("Package1_inst.xml");
+ Udm::DataNetwork& p2 = prj.GetDataNetwork("Package2_inst.xml");
//obtaining handles to the root objects (this is normal - existing - Udm operation)
- CD1::M1 m1 = CD1::M1::Cast( p1.GetRootObject());
- CD2::M2 m2 = CD2::M2::Cast( p2.GetRootObject());
- CD3::MM3 m3 = CD3::MM3::Cast( p3.GetRootObject());
+ ClassA rootP1 = ClassA::Cast( p1.GetRootObject());
+ Class1 rootP2 = Class1::Cast( p2.GetRootObject());
// create Class2
- //M2 class2= M2::Create( m2);
+ Class2 class2= Class2::Create( rootP2);
// create Class3
- //NSp::NSc::Class3 class3 = NSp::NSc::Class3::Create(rootP2);
- //MM3 class3 = MM3::Create( m2);
+ NSp::NSc::Class3 class3 = NSp::NSc::Class3::Create(rootP2);
// create cross links
- //rootP1.dst1()= rootP2;
- //rootP1.dst1()= class3;
- //rootP1.dst2()= class2;
- //rootP1.dst3()+= class3;
-
+ rootP1.dst1()+= rootP2;
+ rootP1.dst1()+= class2;
+ rootP1.dst2()= class2;
+ rootP1.dst3()+= class3;
// verification
- set<CD1::M1> a;
- m2.dst() = m1;
- a.insert(m1);
- m3.src() = a;
-
- CD1::M1 m1_too = m2.dst();
- CPPUNIT_ASSERT( m1 == m1_too);
- set<CD1::M1> a_too = m3.src();
- CPPUNIT_ASSERT(a_too.size() == a.size());
- CPPUNIT_ASSERT(a_too.begin() != a.find(m1));
-
-
-
- //std::set< Class1> dst1s= rootP1.dst();
- //CPPUNIT_ASSERT( dst1s.size() == 2);
- //CPPUNIT_ASSERT( dst1s.find( rootP2) != dst1s.end());
- //CPPUNIT_ASSERT( dst1s.find( class2) != dst1s.end());
- //const Class2& dst2= rootP1.dst2();
- //CPPUNIT_ASSERT( dst2 == class2);
- //std::set< NSp::NSc::Class3> dst3s = rootP1.dst3();
- //CPPUNIT_ASSERT( dst3s.size() == 1);
- //CPPUNIT_ASSERT( dst3s.find( class3) != dst3s.end());
+ std::set< Class1> dst1s= rootP1.dst1();
+ CPPUNIT_ASSERT( dst1s.size() == 2);
+ CPPUNIT_ASSERT( dst1s.find( rootP2) != dst1s.end());
+ CPPUNIT_ASSERT( dst1s.find( class2) != dst1s.end());
+ const Class2& dst2= rootP1.dst2();
+ CPPUNIT_ASSERT( dst2 == class2);
+ std::set< NSp::NSc::Class3> dst3s = rootP1.dst3();
+ CPPUNIT_ASSERT( dst3s.size() == 1);
+ CPPUNIT_ASSERT( dst3s.find( class3) != dst3s.end());
} catch( udm_exception &e)
{
std::cout << e.what() << std::endl;
@@ -80,4 +55,3 @@
}
-
Modified: UDM/trunk/tests/test_crosslinks/Makefile.am
==============================================================================
--- UDM/trunk/tests/test_crosslinks/Makefile.am Fri Dec 6 14:09:30 2013 (r4207)
+++ UDM/trunk/tests/test_crosslinks/Makefile.am Fri Dec 6 14:09:40 2013 (r4208)
@@ -1,42 +1,42 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_srcdir)/include $(CPPUNITINC)
-
-noinst_PROGRAMS = test_CrossLinks
-TESTS = $(noinst_PROGRAMS)
-
-BUILT_SOURCES = CL.cpp CL.h CL.xsd \
- CD1.cpp CD1.h CD1.xsd \
- CD2.cpp CD2.h CD2.xsd \
- CD3.cpp CD3.h CD3.xsd
-test_CrossLinks_SOURCES = CrossLinkTester.cpp CrossLinkTester.h \
- test_CrossLinks.cpp
-nodist_test_CrossLinks_SOURCES = $(BUILT_SOURCES)
-test_CrossLinks_LDADD = ../../lib/libudm.la $(CPPUNITLIBS)
-
-CLEANFILES = $(BUILT_SOURCES) sources-stamp
-
-
-sources-stamp: CL_udm.udm ../../bin/Udm Makefile
- @rm -f sources-temp
- @touch sources-temp
- ../../bin/Udm $< -d ../../etc -T
- @mv -f sources-temp $@
-
-$(BUILT_SOURCES): sources-stamp
-## Recover from the removal of $@
- @if test -f $@; then :; else \
- trap 'rm -rf sources-lock sources-stamp' 1 2 13 15; \
- if mkdir sources-lock 2>/dev/null; then \
-## This code is being executed by the first process.
- rm -f sources-stamp; \
- $(MAKE) $(AM_MAKEFLAGS) sources-stamp; \
- rmdir sources-lock; \
- else \
-## This code is being executed by the follower processes.
-## Wait until the first process is done.
- while test -d sources-lock; do sleep 1; done; \
-## Succeed if and only if the first process succeeded.
- test -f sources-stamp; exit $$?; \
- fi; \
- fi
+## Makefile.am -- Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = -I$(top_srcdir)/include $(CPPUNITINC)
+
+noinst_PROGRAMS = test_CrossLinks
+TESTS = $(noinst_PROGRAMS)
+
+BUILT_SOURCES = CL.cpp CL.h CL.xsd \
+ CLPackage.cpp CLPackage.h CLPackage.xsd \
+ Package1.cpp Package1.h Package1.xsd \
+ Package2.cpp Package2.h Package2.xsd
+test_CrossLinks_SOURCES = CrossLinkTester.cpp CrossLinkTester.h \
+ test_CrossLinks.cpp
+nodist_test_CrossLinks_SOURCES = $(BUILT_SOURCES)
+test_CrossLinks_LDADD = ../../lib/libudm.la $(CPPUNITLIBS)
+
+CLEANFILES = $(BUILT_SOURCES) sources-stamp
+
+
+sources-stamp: CL_udm.udm ../../bin/Udm Makefile
+ @rm -f sources-temp
+ @touch sources-temp
+ ../../bin/Udm $< -d ../../etc -T
+ @mv -f sources-temp $@
+
+$(BUILT_SOURCES): sources-stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ trap 'rm -rf sources-lock sources-stamp' 1 2 13 15; \
+ if mkdir sources-lock 2>/dev/null; then \
+## This code is being executed by the first process.
+ rm -f sources-stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) sources-stamp; \
+ rmdir sources-lock; \
+ else \
+## This code is being executed by the follower processes.
+## Wait until the first process is done.
+ while test -d sources-lock; do sleep 1; done; \
+## Succeed if and only if the first process succeeded.
+ test -f sources-stamp; exit $$?; \
+ fi; \
+ fi
More information about the Mobies-commit
mailing list