From f460d14f247224b3876d61b817a237e658f5e39a Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jul 08 2013 05:56:49 +0000 Subject: updated to new version 2.7 --- diff --git a/adevs-2.6-build.patch b/adevs-2.6-build.patch deleted file mode 100644 index 80cba4e..0000000 --- a/adevs-2.6-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/include/adevs_simulator.h b/include/adevs_simulator.h -index aa2f442..ed6e53e 100644 ---- a/include/adevs_simulator.h -+++ b/include/adevs_simulator.h -@@ -617,7 +617,7 @@ void Simulator::exec_event(Atomic* model, bool internal, T t) - model->delta_ext(t-model->tL,*(model->x)); - } - // Notify any listeners -- notify_state_listeners(model,t); -+ this->notify_state_listeners(model,t); - // Check for a model transition - if (model->model_transition() && model->getParent() != NULL) - { -diff --git a/include/adevs_time.h b/include/adevs_time.h -index 76111ac..061351b 100644 ---- a/include/adevs_time.h -+++ b/include/adevs_time.h -@@ -47,7 +47,7 @@ template struct Time - /// Value for infinity - static adevs::Time Inf() { return Time(adevs_inf(),0); } - /// Constructor. Default time is (0,0). -- Time(T t = 0, unsigned int c = 0):t(t),c(c){} -+ Time(T t = adevs_zero(), unsigned int c = 0):t(t),c(c){} - /// Copy constructor - Time(const Time& t2):t(t2.t),c(t2.c){} - /// Assignment operator -diff --git a/test/alt_time_tests.cpp b/test/alt_time_tests.cpp -index 2409adb..0d0e553 100644 ---- a/test/alt_time_tests.cpp -+++ b/test/alt_time_tests.cpp -@@ -80,10 +80,10 @@ Model::Model(): - a(new PingPong(true)), - b(new PingPong()) - { -- add(a); -- add(b); -- couple(a,b); -- couple(b,a); -+ this->add(a); -+ this->add(b); -+ this->couple(a,b); -+ this->couple(b,a); - } - // Non-standard type for time - class TimeType diff --git a/adevs-2.6-install.patch b/adevs-2.6-install.patch deleted file mode 100644 index afe2782..0000000 --- a/adevs-2.6-install.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/docs/Makefile b/docs/Makefile -index 86bdec0..76222d1 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -13,7 +13,7 @@ pdf_manual: - cd tex-files; latex manual; latex manual; latex manual; dvipdf manual.dvi; mv manual.pdf .. - - html_manual: -- cd tex-files; latex2html -split 3 -no_math -html_version 3.2 -dir ../${MANUAL_DIR} -mkdir -contents_in_navigation manual -+ cd tex-files; latex2html -local_icons -split 3 -no_math -html_version 3.2 -dir ../${MANUAL_DIR} -mkdir -contents_in_navigation manual - - - java_docs: -diff --git a/src/Makefile b/src/Makefile -index 7d0b731..50ee191 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -6,7 +6,7 @@ - # This target builds the java language bindings to the adevs simulator. - # Point this at your java installation if you want to build the Java bindings. - JAVA_HOME = /usr/local/jdk1.6.0_26 --CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -+java_adevs: CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux - # - # 2) adevs - # -@@ -23,7 +23,7 @@ CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux - # adevs object library. Point MODELICA_HOME at your Open Modelica - # installation if you want to build the Modelica extensions for adevs. - MODELICA_HOME = ${HOME}/Code/openmodelica/trunk --CFLAGS += -I${MODELICA_HOME}/build/include/omc -+adevs_with_modelica: CFLAGS += -I${MODELICA_HOME}/build/include/omc - include Makefile.modelica - - # These are generic options for the GNU C++ compiler. -@@ -64,6 +64,13 @@ JAVA_OBJS = \ - # to C++ simulations - adevs: ${ADEVS_OBJS} - ar -r libadevs.a ${ADEVS_OBJS} -+ ${CXX} -shared -Wl,-soname,libadevs.so.2 -o libadevs.so.2.6 ${ADEVS_OBJS} -+ -+install: -+ mkdir -p "${DESTDIR}" -+ install -m 755 -p libadevs.so.2.6 "${DESTDIR}" -+ ln -f -s libadevs.so.2.6 "${DESTDIR}/libadevs.so.2" -+ ln -f -s libadevs.so.2.6 "${DESTDIR}/libadevs.so" - - # This adds the modelica extensions to the adevs library - adevs_with_modelica: ${ADEVS_OBJS} modelica_runtime.o diff --git a/adevs.spec b/adevs.spec index a8d3fbd..7cf1efd 100644 --- a/adevs.spec +++ b/adevs.spec @@ -1,17 +1,13 @@ Name: adevs -Version: 2.6 -Release: 4%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: C++ library for constructing discrete event simulation Group: System Environment/Libraries License: LGPLv2+ URL: http://www.ornl.gov/~1qn/adevs/ Source0: http://www.ornl.gov/~1qn/adevs/adevs.tar.gz -# This patch fixes incompatibility with newer g++ and has been sent upstream -# for future inclusion. -Patch0: adevs-2.6-build.patch -# This patch adds "make install" support, allows building adevs as shared -# library and fixes latex2html invocation to include icons in manual. -Patch1: adevs-2.6-install.patch +# Fixes soname version. +Patch0: adevs-2.7-install.patch BuildRequires: tcl BuildRequires: latex2html @@ -46,8 +42,7 @@ library. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .build -%patch1 -p1 -b .install +%patch0 -p1 -b .install %build export CFLAGS="%{optflags}" @@ -97,7 +92,10 @@ rm -r ./examples/java_life %doc docs/api docs/manual examples %changelog -* Tue Jun 18 2013 Jan Kaluza - 2.3-4 +* Mon Jul 08 2013 Jan Kaluza - 2.7-1 +- updated to new version 2.7 + +* Tue Jun 18 2013 Jan Kaluza - 2.6-4 - fix building tests with the newest g++ * Mon Jun 17 2013 Jan Kaluza - 2.6-3 diff --git a/sources b/sources index ede9b95..67f28a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a268283b9a32c46e5471dbb80df1d924 adevs.tar.gz +f54e8aec7fe86ba475117d63ccdb1ece adevs.tar.gz