From bf4d7f50ffcf5efeffa6d42b2730db8ed014b6c0 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae.fr>
Date: Mon, 13 Oct 2014 11:41:12 +0200
Subject: [PATCH] [wip/certi] Upgrade to stable version 3.4.3
Changes include partial support of IEEE-1516 v2010 API.
At the package level:
- switch to a stable package
- take ownership of the package
---
certi/Makefile | 13 ++--
certi/PLIST | 160 ++++++++++++++++++++++++++++++++----------------
certi/depend.mk | 4 +-
certi/distinfo | 5 +-
4 files changed, 119 insertions(+), 63 deletions(-)
diff --git a/certi/Makefile b/certi/Makefile
index c52bc612..a6e9e859 100644
--- a/certi/Makefile
+++ b/certi/Makefile
@@ -2,15 +2,14 @@
# Created: Arnaud Degroote on Tue, 12 Mar 2013
#
-COMMIT= HEAD
-PKG_VERSION= 20130312
-PKGREVISION= 1
-DISTNAME= certi-${PKG_VERSION}
+PKG_VERSION= 3.4.3
+DISTNAME= CERTI-${PKG_VERSION}-Source
+PKGNAME= certi-${PKG_VERSION}
CATEGORIES= architecture
-MASTER_SITES= :pserver:anonymous@cvs.savannah.nongnu.org:/sources/certi@${COMMIT}+certi
-FETCH_METHOD= cvs
+MASTER_SITES= http://download.savannah.gnu.org/releases/certi/
+MASTER_REPOSITORY= git git://git.savannah.nongnu.org/certi.git
-MAINTAINER= robotpkg@laas.fr
+MAINTAINER= arnaud.degroote@isae-supaero.fr
HOMEPAGE= https://savannah.nongnu.org/projects/certi
COMMENT= An Open Source HLA RTI (High Level Architecture)
LICENSE= gnu-gpl-v2
diff --git a/certi/PLIST b/certi/PLIST
index 068d0cd1..b5d987d3 100644
--- a/certi/PLIST
+++ b/certi/PLIST
@@ -1,87 +1,132 @@
-@comment Tue Mar 12 14:58:56 CET 2013
+@comment Mon Oct 13 11:25:26 CEST 2014
bin/CertiCheckHostAndIP
bin/CertiProcessus_A
bin/CertiProcessus_B
+bin/CertiTestFederate-HLA13
+bin/CertiTestFederate-IEEE1516_2000
+bin/CertiTestFederate-IEEE1516_2010
bin/MessageBufferTests
bin/MsgBufferTests
${PLIST.gui}bin/billard
bin/billard-nogui
+bin/certi-config
bin/hlaomtdif2cpp.py
bin/rtia
bin/rtig
-include/Clock.hh
-include/GettimeofdayClock.hh
-include/HLAbasicType.hh
-include/HLAbuffer.hh
-include/HLAenumeratedType.hh
-include/HLAfixedArray.hh
-include/HLAfixedRecord.hh
-include/HLAtypesIEEE1516.hh
-include/HLAvariableArray.hh
-include/HLAvariantRecord.hh
-include/MessageBuffer.hh
-include/MsgBuffer.h
-include/NullFederateAmbassador.hh
-include/PosixClock.hh
-include/RTI.hh
-include/RTI/Enums.h
-include/RTI/Exception.h
-include/RTI/FederateAmbassador.h
-include/RTI/Handle.h
-include/RTI/LogicalTime.h
-include/RTI/LogicalTimeFactory.h
-include/RTI/LogicalTimeInterval.h
-include/RTI/NullFederateAmbassador.h
-include/RTI/RTI1516.h
-include/RTI/RTI1516fedTime.h
-include/RTI/RTIambassador.h
-include/RTI/RTIambassadorFactory.h
-include/RTI/RangeBounds.h
-include/RTI/SpecificConfig.h
-include/RTI/Typedefs.h
-include/RTI/VariableLengthData.h
-include/RTI/certiLogicalTime.h
-include/RTI/certiLogicalTimeFactory.h
-include/RTI/certiLogicalTimeInterval.h
-include/RTI/certiRTI1516.h
-include/RTIambServices.hh
-include/RTItypes.hh
-include/SHM.hh
-include/SHMPosix.hh
-include/SHMSysV.hh
-include/Semaphore.hh
-include/SemaphorePosix.hh
-include/SemaphoreSysV.hh
-include/baseTypes.hh
-include/federateAmbServices.hh
-include/fedtime.hh
-include/libhla.hh
-include/sha1.h
-include/tlsf.h
+include/hla13/NullFederateAmbassador.hh
+include/hla13/RTI.hh
+include/hla13/RTIambServices.hh
+include/hla13/RTItypes.hh
+include/hla13/baseTypes.hh
+include/hla13/federateAmbServices.hh
+include/hla13/fedtime.hh
+include/ieee1516-2000/RTI/Enums.h
+include/ieee1516-2000/RTI/Exception.h
+include/ieee1516-2000/RTI/FederateAmbassador.h
+include/ieee1516-2000/RTI/Handle.h
+include/ieee1516-2000/RTI/LogicalTime.h
+include/ieee1516-2000/RTI/LogicalTimeFactory.h
+include/ieee1516-2000/RTI/LogicalTimeInterval.h
+include/ieee1516-2000/RTI/NullFederateAmbassador.h
+include/ieee1516-2000/RTI/RTI1516.h
+include/ieee1516-2000/RTI/RTI1516fedTime.h
+include/ieee1516-2000/RTI/RTIambassador.h
+include/ieee1516-2000/RTI/RTIambassadorFactory.h
+include/ieee1516-2000/RTI/RangeBounds.h
+include/ieee1516-2000/RTI/SpecificConfig.h
+include/ieee1516-2000/RTI/Typedefs.h
+include/ieee1516-2000/RTI/VariableLengthData.h
+include/ieee1516-2000/RTI/certiLogicalTime.h
+include/ieee1516-2000/RTI/certiLogicalTimeFactory.h
+include/ieee1516-2000/RTI/certiLogicalTimeInterval.h
+include/ieee1516-2000/RTI/certiRTI1516.h
+include/ieee1516-2010/RTI/Enums.h
+include/ieee1516-2010/RTI/Exception.h
+include/ieee1516-2010/RTI/FederateAmbassador.h
+include/ieee1516-2010/RTI/Handle.h
+include/ieee1516-2010/RTI/LogicalTime.h
+include/ieee1516-2010/RTI/LogicalTimeFactory.h
+include/ieee1516-2010/RTI/LogicalTimeInterval.h
+include/ieee1516-2010/RTI/NullFederateAmbassador.h
+include/ieee1516-2010/RTI/RTI1516.h
+include/ieee1516-2010/RTI/RTI1516fedTime.h
+include/ieee1516-2010/RTI/RTIambassador.h
+include/ieee1516-2010/RTI/RTIambassadorFactory.h
+include/ieee1516-2010/RTI/RangeBounds.h
+include/ieee1516-2010/RTI/SpecificConfig.h
+include/ieee1516-2010/RTI/Typedefs.h
+include/ieee1516-2010/RTI/VariableLengthData.h
+include/ieee1516-2010/RTI/certiLogicalTime.h
+include/ieee1516-2010/RTI/certiLogicalTimeFactory.h
+include/ieee1516-2010/RTI/certiLogicalTimeInterval.h
+include/ieee1516-2010/RTI/certiRTI1516.h
+include/ieee1516-2010/RTI/encoding/BasicDataElements.h
+include/ieee1516-2010/RTI/encoding/DataElement.h
+include/ieee1516-2010/RTI/encoding/EncodingConfig.h
+include/ieee1516-2010/RTI/encoding/EncodingExceptions.h
+include/ieee1516-2010/RTI/encoding/HLAfixedArray.h
+include/ieee1516-2010/RTI/encoding/HLAfixedRecord.h
+include/ieee1516-2010/RTI/encoding/HLAopaqueData.h
+include/ieee1516-2010/RTI/encoding/HLAvariableArray.h
+include/ieee1516-2010/RTI/encoding/HLAvariantRecord.h
+include/ieee1516-2010/RTI/time/HLAfloat64Interval.h
+include/ieee1516-2010/RTI/time/HLAfloat64Time.h
+include/ieee1516-2010/RTI/time/HLAfloat64TimeFactory.h
+include/ieee1516-2010/RTI/time/HLAinteger64Interval.h
+include/ieee1516-2010/RTI/time/HLAinteger64Time.h
+include/ieee1516-2010/RTI/time/HLAinteger64TimeFactory.h
+include/libhla/Clock.hh
+include/libhla/GettimeofdayClock.hh
+include/libhla/HLAbasicType.hh
+include/libhla/HLAbuffer.hh
+include/libhla/HLAenumeratedType.hh
+include/libhla/HLAfixedArray.hh
+include/libhla/HLAfixedRecord.hh
+include/libhla/HLAtypesIEEE1516.hh
+include/libhla/HLAvariableArray.hh
+include/libhla/HLAvariantRecord.hh
+include/libhla/MessageBuffer.hh
+include/libhla/MsgBuffer.h
+include/libhla/PosixClock.hh
+include/libhla/SHM.hh
+include/libhla/SHMPosix.hh
+include/libhla/SHMSysV.hh
+include/libhla/Semaphore.hh
+include/libhla/SemaphorePosix.hh
+include/libhla/SemaphoreSysV.hh
+include/libhla/libhla.hh
+include/libhla/sha1.h
+include/libhla/tlsf.h
lib/libCERTI.so
lib/libCERTI.so.3
-lib/libCERTI.so.3.4.2cvs
+lib/libCERTI.so.${PKGVERSION}
lib/libFedTime.so
lib/libFedTime.so.1
lib/libFedTime.so.1.0.0
lib/libFedTime1516.so
lib/libFedTime1516.so.1
lib/libFedTime1516.so.1.0.0
+lib/libFedTime1516e.so
lib/libHLA.so
lib/libHLA.so.3
-lib/libHLA.so.3.4.2cvs
+lib/libHLA.so.${PKGVERSION}
lib/libRTI-NG.so
lib/libRTI-NG.so.1
lib/libRTI-NG.so.1.0.0
lib/libRTI1516.so
lib/libRTI1516.so.1
lib/libRTI1516.so.1.0.0
+lib/libRTI1516e.so
+lib/libRTI1516e.so.1
+lib/libRTI1516e.so.1.0.0
lib/libgraph-nogui.a
${PLIST.gui}lib/libgraph.a
share/doc/certi/favicon.ico
share/doc/certi/index.html
share/federations/Test.fed
share/federations/Test.xml
+share/federations/testFederation.fed
+share/federations/testFederation.xml
share/scripts/CERTIConfig.cmake
share/scripts/CERTIConfigVersion.cmake
share/scripts/CERTIDepends-release.cmake
@@ -90,5 +135,16 @@ share/scripts/FindCERTI.cmake
share/scripts/FindRTI.cmake
share/scripts/UseCERTI.cmake
share/scripts/dtest_billard.py
+share/scripts/dtest_testFederate.py
share/scripts/myCERTI_env.csh
share/scripts/myCERTI_env.sh
+share/xml/README.txt
+share/xml/ieee1516-2000/1516_2-2000/HLA.dtd
+share/xml/ieee1516-2000/1516_2-2000/OMT-DIF.xml
+share/xml/ieee1516-2010/1516_1-2010/HLAstandardMIM.xml
+share/xml/ieee1516-2010/1516_1-2010/IEEE1516-FDD-2010.xsd
+share/xml/ieee1516-2010/1516_1-2010/hla1516e.wsdl
+share/xml/ieee1516-2010/1516_2-2010/IEEE1516-DIF-2010.xsd
+share/xml/ieee1516-2010/1516_2-2010/IEEE1516-OMT-2010.xsd
+share/xml/ieee1516-2010/1516_2-2010/RestaurantFOMmodule.xml
+share/xml/ieee1516-2010/1516_2-2010/RestaurantSOMmodule.xml
diff --git a/certi/depend.mk b/certi/depend.mk
index 8b1c795a..d3f26b2b 100644
--- a/certi/depend.mk
+++ b/certi/depend.mk
@@ -14,12 +14,12 @@ PREFER.certi?= robotpkg
DEPEND_USE+= certi
-DEPEND_ABI.certi?= certi>=20120101
+DEPEND_ABI.certi?= certi>=3.4.0
DEPEND_DIR.certi?= ../../wip/certi
SYSTEM_SEARCH.certi=\
bin/rtia \
- include/RTI.hh \
+ include/hla13/RTI.hh \
lib/libCERTI.so
endif
diff --git a/certi/distinfo b/certi/distinfo
index 6a1e11fe..80fff6c7 100644
--- a/certi/distinfo
+++ b/certi/distinfo
@@ -1,2 +1,3 @@
-SHA1 (certi-20130312.tar.gz) = adc6a24ddcf952ca9ae0862cd67444c4835b5827
-RMD160 (certi-20130312.tar.gz) = 1d2f507fbfffef040544116f903b28c8d3783423
+SHA1 (CERTI-3.4.3-Source.tar.gz) = 23a3ecaa5e928d311801c36bee64eba3142c5c23
+RMD160 (CERTI-3.4.3-Source.tar.gz) = b671359265a0f4bab6f5537807dab34c510ef7a6
+Size (CERTI-3.4.3-Source.tar.gz) = 2098421 bytes
--
GitLab