Menu
▾
▴
sdif-cvs — This list receives the CVS logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(24) |
Nov
(48) |
Dec
(106) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(2) |
Feb
(3) |
Mar
(5) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(3) |
Oct
(10) |
Nov
(52) |
Dec
(12) |
| 2008 |
Jan
(56) |
Feb
(14) |
Mar
(19) |
Apr
(19) |
May
(12) |
Jun
(5) |
Jul
(6) |
Aug
|
Sep
(39) |
Oct
(1) |
Nov
|
Dec
(11) |
| 2009 |
Jan
(17) |
Feb
(11) |
Mar
|
Apr
(10) |
May
|
Jun
|
Jul
(5) |
Aug
(15) |
Sep
|
Oct
(19) |
Nov
(2) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(13) |
May
|
Jun
(8) |
Jul
(3) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(4) |
| 2012 |
Jan
(25) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
|
Jun
(1) |
Jul
(9) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(2) |
Apr
(4) |
May
(11) |
Jun
(2) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(2) |
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Axel R. <ro...@us...> - 2012-01-05 11:31:53
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv26273
Modified Files:
CMakeLists.txt
Log Message:
Removed remaining references to trial with Extensions.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CMakeLists.txt 4 Jan 2012 12:19:09 -0000 1.12
--- CMakeLists.txt 5 Jan 2012 11:31:50 -0000 1.13
***************
*** 24,29 ****
MESSAGE(STATUS "PYTHON_VERSION ${PYTHON_VERSION}")
SET(BUILD_WITH_INSTALL_RPATH ON)
-
- ADD_LIBRARY(Extensions STATIC Extensions.cxx)
SET(INTERFACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/easdif-python.i)
--- 24,27 ----
***************
*** 33,37 ****
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif_static${DEBUGEXT} Extensions ${PYTHON_LIBRARY})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
--- 31,35 ----
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif_static${DEBUGEXT} ${PYTHON_LIBRARY})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
|
|
From: Axel R. <ro...@us...> - 2012-01-05 11:14:09
|
Update of /cvsroot/sdif/Easdif In directory vz-cvs-3.sog:/tmp/cvs-serv19664 Modified Files: ChangeLog Log Message: Updated Changlog Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/Easdif/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** ChangeLog 5 Jan 2012 01:29:32 -0000 1.86 --- ChangeLog 5 Jan 2012 11:14:07 -0000 1.87 *************** *** 3,6 **** --- 3,15 ---- * swig/python/easdif-python.i: + Fixed memory leak during use of iterables. + Added automatic generation of documentation for generated python + module + + * swig/easdif-common-init.i: Added documentation to module. + + 2012-01-05 Axel Roebel <roebel@m1873.local> + + * swig/python/easdif-python.i: Make Entity and Frame iterable and take car that iteration is efficient by means of returning pointers to Frames and matrices. |
|
From: Axel R. <ro...@us...> - 2012-01-05 11:11:24
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv17994/swig/python
Modified Files:
easdif-python.i
Log Message:
Added documentation and fixed memory leak.
Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** easdif-python.i 5 Jan 2012 01:18:07 -0000 1.9
--- easdif-python.i 5 Jan 2012 11:11:21 -0000 1.10
***************
*** 6,9 ****
--- 6,12 ----
//
// $Log$
+ // Revision 1.10 2012/01/05 11:11:21 roebel
+ // Added documentation and fixed memory leak.
+ //
// Revision 1.9 2012/01/05 01:18:07 roebel
// Make Entity and Frame iterable and take car that iteration is efficient by means of
***************
*** 40,43 ****
--- 43,47 ----
// include common init
%include ../easdif-common-init.i
+ %feature("autodoc", "1");
// include typemaps
***************
*** 97,101 ****
}
!
%extend Easdif::SDIFEntity{
Easdif::SDIFEntity&
--- 101,105 ----
}
! %newobject Easdif::SDIFEntity::next;
%extend Easdif::SDIFEntity{
Easdif::SDIFEntity&
***************
*** 136,139 ****
--- 140,144 ----
+ %newobject Easdif::SDIFFrame::next;
%extend Easdif::SDIFFrame {
Easdif::SDIFFrame*
|
|
From: Axel R. <ro...@us...> - 2012-01-05 11:10:55
|
Update of /cvsroot/sdif/Easdif/swig In directory vz-cvs-3.sog:/tmp/cvs-serv17884/swig Modified Files: easdif-common-init.i Log Message: Added documentation to module. Index: easdif-common-init.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/easdif-common-init.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** easdif-common-init.i 5 Jan 2012 00:55:54 -0000 1.4 --- easdif-common-init.i 5 Jan 2012 11:10:52 -0000 1.5 *************** *** 2,6 **** // generate perl module named 'eaSDIF' ! %module eaSDIF // module initialisation code --- 2,6 ---- // generate perl module named 'eaSDIF' ! %module(docstring="Easy SDIF wrapper module for reading wrting SDIF files") eaSDIF // module initialisation code |
|
From: Axel R. <ro...@us...> - 2012-01-05 01:29:34
|
Update of /cvsroot/sdif/Easdif In directory vz-cvs-3.sog:/tmp/cvs-serv17559 Modified Files: ChangeLog Log Message: Version 1.4.16 - changes mostly in mex compilation and swig/python implementation. Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/Easdif/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** ChangeLog 19 Dec 2011 17:57:50 -0000 1.85 --- ChangeLog 5 Jan 2012 01:29:32 -0000 1.86 *************** *** 1,2 **** --- 1,72 ---- + 2012-01-05 Axel Roebel <roebel@m1873.local> + Version 1.4.16 + + * swig/python/easdif-python.i: + Make Entity and Frame iterable and take car that iteration is efficient by means of + returning pointers to Frames and matrices. + + * swig/easdif-common-init.i, swig/easdif-common.i.in: + Provide access to FrameDirectory. + + * swig/CMakeLists.txt: + Support disabling of target languages. + + 2012-01-04 Axel Roebel <roebel@m1873.local> + + * swig/python/CMakeLists.txt, swig/python/easdif-python.i: + Create derived class to render Frame and Entity into python iterable. + + * swig/python/setup.py.in: Use configured version number. + + * swig/easdif-common.i.in: + Removed all exception classes from the interface. They are not very useful anyway. + + 2012-01-03 Axel Roebel <roebel@m1873.local> + + * easdif/sdif_matrix.hpp: + Changed SetRow(std::vector and SetCol(const std::vector into template member functions and add exception if inout vector size + does not fit the row or column size. + + * swig/easdif-common.i.in: + Improve exception handling and add instantiation of template member functions for swig. + While swig generates warnings that if will ignore the overloads the template functions are notin fact not ignored. + + * swig/easdif-common-init.i: + Added std::vector<float> and std::vector<int> proxy types for matrix access. + + * README, matlab/CMakeLists.txt: + Support mex fie generation in GUI IDEs (MSVC and Xcode) for cmake version 2.8.5 and above. + + * README: Improved doc. + + * swig/python/CMakeLists.txt, swig/python/setup.py.in: + Added python install target. + + * swig/python/setup.py.in: Updated info. + + * swig/python/CMakeLists.txt, swig/python/setup.py.in: + Improved flexibility of swig python configuration. + + 2012-01-02 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt: Added missing call to SET_COMPILER_FLAGS. + + * matlab/CMakeLists.txt: Updated for windows/Visual C++ compatibility. + + * easdif/easdif_exports.hpp, SDIF/include/sdif.h.in, SDIF/sdif/SdifFile.c, SDIF/sdif/SdifHard_OS.c, SDIF/sdif/host_architecture.h, SDIF/sdif/sdif_portability.h, SDIF/tools/sdifextract.c: + Base selection of WIN32 specific implementation on definition of macros WIN32 OR _WIN32. The latter being standard in + Visual C++ it is most important to have it. + + 2011-12-19 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt, ChangeLog: Version 1.4.15 + + * SDIF/ChangeLog, SDIF/configure.in: Version 3.11.4 + + * SDIF/ChangeLog: document change + + * SDIF/sdif/SdifFGet.c: + Graefully handle NVT tables that do not include a trailing 0. This problem is related to the use of the writesdif function to create NVT tables + 2011-12-19 Axel Roebel <ro...@m1...> Version 1.4.15 |
|
From: Axel R. <ro...@us...> - 2012-01-05 01:18:10
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv14161
Modified Files:
easdif-python.i
Log Message:
Make Entity and Frame iterable and take car that iteration is efficient by means of
returning pointers to Frames and matrices.
Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** easdif-python.i 4 Jan 2012 12:19:09 -0000 1.8
--- easdif-python.i 5 Jan 2012 01:18:07 -0000 1.9
***************
*** 6,9 ****
--- 6,13 ----
//
// $Log$
+ // Revision 1.9 2012/01/05 01:18:07 roebel
+ // Make Entity and Frame iterable and take car that iteration is efficient by means of
+ // returning pointers to Frames and matrices.
+ //
// Revision 1.8 2012/01/04 12:19:09 roebel
// Create derived class to render Frame and Entity into python iterable.
***************
*** 43,46 ****
--- 47,71 ----
%include ../easdif-defines.i
+ %{
+ #include "easdif/easdif.h"
+
+ // proxy class for frame that provides Frame iterator with storage location for iterator position
+ struct
+ FrameIt {
+ const Easdif::SDIFFrame *mpOriFrame;
+ int mIterPos;
+ FrameIt(const Easdif::SDIFFrame& in ) : mpOriFrame(&in), mIterPos(0) {}
+ ~FrameIt() {}
+ const Easdif::SDIFMatrix&
+ next() {
+ if(mIterPos < static_cast<int>(mpOriFrame->GetNbMatrix()))
+ return mpOriFrame->GetMatrix(mIterPos++);
+ throw std::runtime_error("StopIteration");
+ }
+ };
+
+
+ %}
+
// include common module directive
%include ../easdif-common.i
***************
*** 54,67 ****
};
- %{
- #include "swig/python/Extensions.h"
- %}
-
-
- %include "Extensions.h"
-
%template(SelectionSetI) Easdif::SelectionSet<unsigned int>;
%exception Easdif::SDIFEntity::next() {
try {
--- 79,90 ----
};
%template(SelectionSetI) Easdif::SelectionSet<unsigned int>;
+
+ // make entity iterable
+ // but attention next method does not provide a reference
+ // but a pointer to a new Frame so we cannot modify the entity by means of the
+ // frames in a loop
%exception Easdif::SDIFEntity::next() {
try {
***************
*** 69,73 ****
}
catch(const Easdif::SDIFEof& e) {
- Easdif::SDIFFrame localFrame;
PyErr_SetNone(PyExc_StopIteration);
return NULL;
--- 92,95 ----
***************
*** 76,91 ****
-
%extend Easdif::SDIFEntity{
Easdif::SDIFEntity&
! __iter__() {
return *$self;
}
! const Easdif::SDIFFrame
! next() {
! Easdif::SDIFFrame localFrame;
! $self->ReadNextSelectedFrame(localFrame);
! return localFrame;
! }
}
--- 98,158 ----
%extend Easdif::SDIFEntity{
Easdif::SDIFEntity&
! __iter__() {
! // ensure that the complete file will be read
! $self->Rewind();
return *$self;
}
!
! // prefer to work with pointers in python
! Easdif::SDIFFrame*
! next() {
! //allocate new frame
! Easdif::SDIFFrame *localFrame = new(Easdif::SDIFFrame);
! try {
! $self->ReadNextSelectedFrame(*localFrame);
! } catch(...) {
! delete localFrame;
! throw;
! }
! return localFrame;
! }
}
+ // make entity iterable
+ // but attention next method does not provide a reference
+ // but a pointer to a new Matrix. This avoids problems with the missing reference counting
+ // that would arise if teh original frame disappears before the matrix
+ %exception Easdif::SDIFFrame::next() {
+ try {
+ $action
+ }
+ catch(const std::runtime_error& e) {
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
+ }
+
+
+ %extend Easdif::SDIFFrame {
+ Easdif::SDIFFrame*
+ __iter__() {
+ return reinterpret_cast<Easdif::SDIFFrame*>(new FrameIt(*$self));
+ }
+ // prefer to work with pointers in python
+ Easdif::SDIFMatrix*
+ next() {
+ FrameIt * it = reinterpret_cast<FrameIt*>($self);
+ Easdif::SDIFMatrix *pMat = new(Easdif::SDIFMatrix);
+ try {
+ *pMat = it->next();
+ }
+ catch(...) {
+ delete pMat;
+ throw;
+ }
+ return pMat;
+ }
+ }
+
|
|
From: Axel R. <ro...@us...> - 2012-01-05 00:55:56
|
Update of /cvsroot/sdif/Easdif/swig
In directory vz-cvs-3.sog:/tmp/cvs-serv7477/swig
Modified Files:
easdif-common-init.i easdif-common.i.in
Log Message:
Provide access to FrameDirectory.
Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** easdif-common.i.in 4 Jan 2012 12:17:36 -0000 1.16
--- easdif-common.i.in 5 Jan 2012 00:55:54 -0000 1.17
***************
*** 6,9 ****
--- 6,12 ----
//
// $Log$
+ // Revision 1.17 2012/01/05 00:55:54 roebel
+ // Provide access to FrameDirectory.
+ //
// Revision 1.16 2012/01/04 12:17:36 roebel
// Removed all exception classes that are not very useful anyway.
***************
*** 107,110 ****
--- 110,114 ----
using namespace Easdif;
+
%}
***************
*** 115,118 ****
--- 119,124 ----
%template(stringmap) std::map<std::string,std::string>;
+ // For SDIFDirectory Entity::GetDirectory.
+ %template(Directory) std::list<Easdif::SDIFLocation>;
Index: easdif-common-init.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common-init.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** easdif-common-init.i 3 Jan 2012 23:39:28 -0000 1.3
--- easdif-common-init.i 5 Jan 2012 00:55:54 -0000 1.4
***************
*** 13,19 ****
%include std_string.i
! // include typemap for std::string from SWIG library
%include std_vector.i
// create signatures
%inline %{
--- 13,22 ----
%include std_string.i
! // include typemap for std::vector from SWIG library
%include std_vector.i
+ // include typemap for std::list from SWIG library
+ %include std_list.i
+
// create signatures
%inline %{
|
|
From: Axel R. <ro...@us...> - 2012-01-05 00:36:29
|
Update of /cvsroot/sdif/Easdif/swig
In directory vz-cvs-3.sog:/tmp/cvs-serv1504
Modified Files:
CMakeLists.txt
Log Message:
Support disabling target languages.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CMakeLists.txt 9 Apr 2008 22:04:25 -0000 1.8
--- CMakeLists.txt 5 Jan 2012 00:36:26 -0000 1.9
***************
*** 21,30 ****
CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
! MESSAGE(STATUS "python")
! ADD_SUBDIRECTORY(python)
! MESSAGE(STATUS "perl5")
! ADD_SUBDIRECTORY(perl5)
! MESSAGE(STATUS "java")
! ADD_SUBDIRECTORY(java)
ENDIF(SWIG_FOUND)
MESSAGE("-------------------------------------------------")
--- 21,37 ----
CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
! IF(NOT SWIG_NO_PYTHON)
! MESSAGE(STATUS "python")
! ADD_SUBDIRECTORY(python)
! ENDIF(NOT SWIG_NO_PYTHON)
! IF(NOT SWIG_NO_PERL)
! MESSAGE(STATUS "perl5")
! ADD_SUBDIRECTORY(perl5)
! ENDIF(NOT SWIG_NO_PERL)
! IF(NOT SWIG_NO_JAVA)
! MESSAGE(STATUS "java")
! ADD_SUBDIRECTORY(java)
! ENDIF(NOT SWIG_NO_JAVA)
!
ENDIF(SWIG_FOUND)
MESSAGE("-------------------------------------------------")
|
|
From: Axel R. <ro...@us...> - 2012-01-04 12:19:11
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv1903/swig/python
Modified Files:
CMakeLists.txt easdif-python.i
Log Message:
Create derived class to render Frame and Entity into python iterable.
Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** easdif-python.i 10 Dec 2006 17:37:30 -0000 1.7
--- easdif-python.i 4 Jan 2012 12:19:09 -0000 1.8
***************
*** 6,9 ****
--- 6,12 ----
//
// $Log$
+ // Revision 1.8 2012/01/04 12:19:09 roebel
+ // Create derived class to render Frame and Entity into python iterable.
+ //
// Revision 1.7 2006/12/10 17:37:30 roebel
// SelectionSet now renamed to SelectionSetI to prevent
***************
*** 25,29 ****
//
// Revision 1.2 2003/05/28 16:57:03 roebel
! // Made configure switching map support according tothe swig version installed.
//
// Revision 1.1 2003/04/30 11:45:48 tisseran
--- 28,32 ----
//
// Revision 1.2 2003/05/28 16:57:03 roebel
! // Made configure switching map support according to the swig version installed.
//
// Revision 1.1 2003/04/30 11:45:48 tisseran
***************
*** 51,54 ****
--- 54,91 ----
};
+ %{
+ #include "swig/python/Extensions.h"
+ %}
+
+
+ %include "Extensions.h"
+
+
%template(SelectionSetI) Easdif::SelectionSet<unsigned int>;
+ %exception Easdif::SDIFEntity::next() {
+ try {
+ $action
+ }
+ catch(const Easdif::SDIFEof& e) {
+ Easdif::SDIFFrame localFrame;
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
+ }
+
+
+
+ %extend Easdif::SDIFEntity{
+ Easdif::SDIFEntity&
+ __iter__() {
+ return *$self;
+ }
+ const Easdif::SDIFFrame
+ next() {
+ Easdif::SDIFFrame localFrame;
+ $self->ReadNextSelectedFrame(localFrame);
+ return localFrame;
+ }
+ }
+
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CMakeLists.txt 3 Jan 2012 01:28:40 -0000 1.11
--- CMakeLists.txt 4 Jan 2012 12:19:09 -0000 1.12
***************
*** 24,27 ****
--- 24,29 ----
MESSAGE(STATUS "PYTHON_VERSION ${PYTHON_VERSION}")
SET(BUILD_WITH_INSTALL_RPATH ON)
+
+ ADD_LIBRARY(Extensions STATIC Extensions.cxx)
SET(INTERFACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/easdif-python.i)
***************
*** 31,35 ****
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif_static${DEBUGEXT} ${PYTHON_LIBRARY})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
--- 33,37 ----
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif_static${DEBUGEXT} Extensions ${PYTHON_LIBRARY})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
***************
*** 40,43 ****
--- 42,46 ----
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
+
IF(APPLE)
SET(LOADPATH DYLD_LIBRARY_PATH)
|
|
From: Axel R. <ro...@us...> - 2012-01-04 12:18:15
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv1774/swig/python
Modified Files:
setup.py.in
Log Message:
Use configured version number.
Index: setup.py.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/setup.py.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py.in 3 Jan 2012 01:28:40 -0000 1.3
--- setup.py.in 4 Jan 2012 12:18:13 -0000 1.4
***************
*** 4,8 ****
setup(name='eaSDIF',
! version='1.4.15',
description='SDIF file handling support for python',
author='Numerous',
--- 4,8 ----
setup(name='eaSDIF',
! version="${EASDIF_VERSION}",
description='SDIF file handling support for python',
author='Numerous',
|
|
From: Axel R. <ro...@us...> - 2012-01-04 12:17:39
|
Update of /cvsroot/sdif/Easdif/swig In directory vz-cvs-3.sog:/tmp/cvs-serv1675/swig Modified Files: easdif-common.i.in Log Message: Removed all exception classes that are not very useful anyway. Index: easdif-common.i.in =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** easdif-common.i.in 3 Jan 2012 23:56:35 -0000 1.15 --- easdif-common.i.in 4 Jan 2012 12:17:36 -0000 1.16 *************** *** 6,9 **** --- 6,12 ---- // // $Log$ + // Revision 1.16 2012/01/04 12:17:36 roebel + // Removed all exception classes that are not very useful anyway. + // // Revision 1.15 2012/01/03 23:56:35 roebel // Improve exception handling and add instantiation of template member functions for swig. *************** *** 136,139 **** --- 139,143 ---- %ignore Easdif::SDIFFrame::GetMatrixWithSig(const SdifSignature) const; + // if this is given then the // Easdif::SDIFMatrix::GetRow(std::vector,int) and *************** *** 169,175 **** %include "@EASDIF_INC_DIR@/easdif/sdifnamevaluetable.hpp" %include "@EASDIF_INC_DIR@/easdif/sdif_frame.hpp" ! %include "@EASDIF_INC_DIR@/easdif/sdifexception.hpp" ! ! %template(GetRow) Easdif::SDIFMatrix::GetRow<double>; --- 173,177 ---- %include "@EASDIF_INC_DIR@/easdif/sdifnamevaluetable.hpp" %include "@EASDIF_INC_DIR@/easdif/sdif_frame.hpp" ! %include "@EASDIF_INC_DIR@/easdif/sdifentity.hpp" %template(GetRow) Easdif::SDIFMatrix::GetRow<double>; *************** *** 187,189 **** %template(SetCol) Easdif::SDIFMatrix::SetCol<int>; ! %include "@EASDIF_INC_DIR@/easdif/sdifentity.hpp" --- 189,191 ---- %template(SetCol) Easdif::SDIFMatrix::SetCol<int>; ! |
|
From: Axel R. <ro...@us...> - 2012-01-04 00:00:35
|
Update of /cvsroot/sdif/Easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv13540
Modified Files:
CMakeLists.txt
Log Message:
Increased version to 1.4.16.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** CMakeLists.txt 2 Jan 2012 23:55:10 -0000 1.72
--- CMakeLists.txt 4 Jan 2012 00:00:32 -0000 1.73
***************
*** 32,36 ****
PROJECT(EaSDIF)
! CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
IF(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW)
--- 32,36 ----
PROJECT(EaSDIF)
! CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
IF(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW)
***************
*** 40,44 ****
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 15)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
--- 40,44 ----
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 16)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
|
|
From: Axel R. <ro...@us...> - 2012-01-03 23:59:27
|
Update of /cvsroot/sdif/Easdif/easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv13369/easdif
Modified Files:
sdif_matrix.hpp
Log Message:
Changed SetRow(std::vector and SetCol(const std::vector into template member functions and add exception if inout vector size
does not fit the row or column size.
Index: sdif_matrix.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sdif_matrix.hpp 20 Jun 2008 17:07:02 -0000 1.7
--- sdif_matrix.hpp 3 Jan 2012 23:59:25 -0000 1.8
***************
*** 37,40 ****
--- 37,44 ----
*
* $Log$
+ * Revision 1.8 2012/01/03 23:59:25 roebel
+ * Changed SetRow(std::vector and SetCol(const std::vector into template member functions and add exception if inout vector size
+ * does not fit the row or column size.
+ *
* Revision 1.7 2008/06/20 17:07:02 roebel
* Changed Print methods to be const.
***************
*** 729,734 ****
*
*/
void
! SetRow(const std::vector<double> &in,int irow) const throw (SDIFArrayPosition) {
mInter->SetRow(&(in[0]),irow);
return;
--- 733,744 ----
*
*/
+ template <class VECVAL_T>
void
! SetRow(const std::vector<VECVAL_T> &in,int irow) throw (SDIFArrayPosition) {
! if(static_cast<int>(in.size()) != GetNbCols())
! throw SDIFArrayPosition(eError,
! "Error in SDIFMatrix::SetRow!!! vector size of input vector does not match number of columns !!!",
! 0, eArrayPosition,__FILE__,__LINE__);
!
mInter->SetRow(&(in[0]),irow);
return;
***************
*** 757,762 ****
*
*/
void
! SetCol(const std::vector<double> &in,int icol) const throw (SDIFArrayPosition) {
mInter->SetCol(&(in[0]),icol);
}
--- 767,778 ----
*
*/
+ template <class VECVAL_T>
void
! SetCol(const std::vector<VECVAL_T> &in,int icol) throw (SDIFArrayPosition) {
! if(static_cast<int>(in.size()) != GetNbRows()){
! throw SDIFArrayPosition(eError,
! "Error in SDIFMatrix::SetCol:: vector size of input vector does not match number of rows !!!",
! 0, eArrayPosition,__FILE__,__LINE__);
! }
mInter->SetCol(&(in[0]),icol);
}
|
|
From: Axel R. <ro...@us...> - 2012-01-03 23:56:38
|
Update of /cvsroot/sdif/Easdif/swig
In directory vz-cvs-3.sog:/tmp/cvs-serv11917/swig
Modified Files:
easdif-common.i.in
Log Message:
Improve exception handling and add instantiation of template member functions for swig.
While swig generates warnings that if will ignore the overloads the template functions are notin fact not ignored.
Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** easdif-common.i.in 27 Nov 2006 16:49:45 -0000 1.14
--- easdif-common.i.in 3 Jan 2012 23:56:35 -0000 1.15
***************
*** 6,9 ****
--- 6,13 ----
//
// $Log$
+ // Revision 1.15 2012/01/03 23:56:35 roebel
+ // Improve exception handling and add instantiation of template member functions for swig.
+ // While swig generates warnings that if will ignore the overloads the template functions are notin fact not ignored.
+ //
// Revision 1.14 2006/11/27 16:49:45 roebel
// Changed arguemnt mapping of SDIFMatrix::GetRow/GetCol functions.
***************
*** 110,114 ****
! // change SWIG class names because we prefix with SDIF:: anyway
%rename(Frame) Easdif::SDIFFrame;
%rename(Entity) Easdif::SDIFEntity;
--- 114,118 ----
! // change SWIG class names because we prefix with eaSDIF:: anyway
%rename(Frame) Easdif::SDIFFrame;
%rename(Entity) Easdif::SDIFEntity;
***************
*** 126,129 ****
--- 130,134 ----
// SdifDataTypeET are indistinguishably int for swig
%ignore Easdif::SDIFMatrix::SDIFMatrix(SdifSignature, int, int, SdifDataTypeET);
+ %ignore Easdif::SDIFMatrix::operator=(const SDIFMatrix&);
// have to be ignrored due to bug in swig that does not handle
// correctly the typemap for SdifSignature when resolving overloaded
***************
*** 143,157 ****
// read all class definitions
#define SWIG_RENAME_EASDIF
- %include "@EASDIF_INC_DIR@/easdif/sdif_matrix.hpp"
- %include "@EASDIF_INC_DIR@/easdif/sdifnamevaluetable.hpp"
- %include "@EASDIF_INC_DIR@/easdif/sdif_frame.hpp"
- %include "@EASDIF_INC_DIR@/easdif/sdifexception.hpp"
! // exceptions to be used for entity only
%exception {
try {
$action
! } catch(SDIFException e) {
! SWIG_exception(SWIG_IOError,e.getmessage().c_str());
} catch(...) {
SWIG_exception(SWIG_UnknownError,"Unknown exception");
--- 148,163 ----
// read all class definitions
#define SWIG_RENAME_EASDIF
!
! // filter all exceptions and transform into Target exceptions preserving the error message
%exception {
try {
$action
! } catch(const SDIFArrayPosition& e) {
! SWIG_exception(SWIG_IndexError,e.getmessage().c_str());
! } catch(const SDIFException& e) {
! SWIG_exception(SWIG_RuntimeError,e.getmessage().c_str());
! } catch(const std::exception& e) {
! SWIG_exception(SWIG_SystemError, e.what());
} catch(...) {
SWIG_exception(SWIG_UnknownError,"Unknown exception");
***************
*** 160,162 ****
--- 166,189 ----
+ %include "@EASDIF_INC_DIR@/easdif/sdif_matrix.hpp"
+ %include "@EASDIF_INC_DIR@/easdif/sdifnamevaluetable.hpp"
+ %include "@EASDIF_INC_DIR@/easdif/sdif_frame.hpp"
+ %include "@EASDIF_INC_DIR@/easdif/sdifexception.hpp"
+
+
+
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<double>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<float>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<int>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<double>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<float>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<int>;
+
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<double>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<float>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<int>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<double>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<float>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<int>;
+
%include "@EASDIF_INC_DIR@/easdif/sdifentity.hpp"
|
|
From: Axel R. <ro...@us...> - 2012-01-03 23:39:30
|
Update of /cvsroot/sdif/Easdif/swig
In directory vz-cvs-3.sog:/tmp/cvs-serv8040/swig
Modified Files:
easdif-common-init.i
Log Message:
Added std::vector<float> and std::vector<int> proxy types for matrix access.
Index: easdif-common-init.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common-init.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** easdif-common-init.i 8 Dec 2006 17:57:04 -0000 1.2
--- easdif-common-init.i 3 Jan 2012 23:39:28 -0000 1.3
***************
*** 28,31 ****
--- 28,33 ----
namespace std {
%template(Vector) vector<double>;
+ %template(FVector) vector<float>;
+ %template(IVector) vector<int>;
%template(Selection) vector<unsigned int>;
};
|
|
From: Axel R. <ro...@us...> - 2012-01-03 23:38:27
|
Update of /cvsroot/sdif/Easdif/matlab
In directory vz-cvs-3.sog:/tmp/cvs-serv7889/matlab
Modified Files:
CMakeLists.txt
Log Message:
Support mex fie generation in GUI IDEs (MSVC and Xcode) for cmake version 2.8.5 and above.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/matlab/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CMakeLists.txt 2 Jan 2012 23:51:51 -0000 1.12
--- CMakeLists.txt 3 Jan 2012 23:38:25 -0000 1.13
***************
*** 22,27 ****
--- 22,36 ----
ENDIF(NOT MEX AND APPLE)
+
+ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER "2.8.4")
+ SET(USE_GEN_EXPRESSIONS ON)
+ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER "2.8.4")
+ SET(USE_GEN_EXPRESSIONS ON)
+ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER "2.8.4")
+
+
IF(MEX)
MESSAGE(STATUS "matlab mex wrapper :: using mex -> ${MEX}")
+ MESSAGE(STATUS "generator expression supported -> ${USE_GEN_EXPRESSIONS}")
# Attention the line breaks are required for mac ppc
SET(SOURCE "#include<mex.h>
***************
*** 128,131 ****
--- 137,142 ----
ENDIF(CMAKE_COMPILER_IS_GNUCXX AND GCC_HAS_VISIBILITY)
+
+
ADD_CUSTOM_TARGET(mex)
SET(INSTALL_MEX_FILES )
***************
*** 142,151 ****
MESSAGE("ADD CUSTOM COMMAND ::${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} \"${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}\" \"${MEX_CXX_FLAGS} ${ADDCFLAGS}\" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}::")
ENDIF(DEBUG)
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMAND echo "Processing: ${_current_FILE}"
! COMMAND
! ${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} "${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}" "${MEX_CXX_FLAGS} ${ADDCFLAGS}" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
!
ADD_CUSTOM_TARGET(${_basename}${DEBUGEXT} DEPENDS ${_o_FILE})
#ADD_DEPENDENCIES(${_basename} ${_o_FILE} )
--- 153,169 ----
MESSAGE("ADD CUSTOM COMMAND ::${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} \"${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}\" \"${MEX_CXX_FLAGS} ${ADDCFLAGS}\" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}::")
ENDIF(DEBUG)
! IF(USE_GEN_EXPRESSIONS)
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMENT "Processing: ${_current_FILE}"
! COMMAND
! ${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} "${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}" "${MEX_CXX_FLAGS} ${ADDCFLAGS}" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L$<TARGET_FILE_DIR:Easdif_static_pic${DEBUGEXT}> -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
! ELSE(USE_GEN_EXPRESSIONS)
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMENT "Processing: ${_current_FILE}"
! COMMAND
! ${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} "${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}" "${MEX_CXX_FLAGS} ${ADDCFLAGS}" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
! ENDIF(USE_GEN_EXPRESSIONS)
ADD_CUSTOM_TARGET(${_basename}${DEBUGEXT} DEPENDS ${_o_FILE})
#ADD_DEPENDENCIES(${_basename} ${_o_FILE} )
***************
*** 156,159 ****
--- 174,178 ----
SET(SOURCES Fsdif_read_handler.cpp Fsdif_write_handler.cpp)
+
MEXCOMPILE_FILES(${SOURCES})
***************
*** 176,179 ****
--- 195,199 ----
MESSAGE(STATUS "octave mex wrapper :: using mkoctfile -> ${MKOCT}")
+ MESSAGE(STATUS "generator expression supported -> ${USE_GEN_EXPRESSIONS}")
EXECUTE_PROCESS(COMMAND ${MKOCT} -v RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
***************
*** 195,203 ****
# MESSAGE(STATUS "_current_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} _o_FILE ${_o_FILE}")
SET(INSTALL_OCT_FILES ${INSTALL_OCT_FILES} ${_o_FILE})
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMAND echo "Processing: ${_current_FILE}"
! COMMAND
! ${MKOCT} --mex -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. --output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
ADD_CUSTOM_TARGET(${_basename}_oct${DEBUGEXT} DEPENDS ${_o_FILE})
--- 215,231 ----
# MESSAGE(STATUS "_current_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} _o_FILE ${_o_FILE}")
SET(INSTALL_OCT_FILES ${INSTALL_OCT_FILES} ${_o_FILE})
! IF(USE_GEN_EXPRESSIONS)
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMENT "Processing: ${_current_FILE}"
! COMMAND
! ${MKOCT} --mex -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. --output ${_o_FILE} -L$<TARGET_FILE_DIR:Easdif_static_pic${DEBUGEXT}> -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
! ELSE(USE_GEN_EXPRESSIONS)
! ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
! COMMENT "Processing: ${_current_FILE}"
! COMMAND
! ${MKOCT} --mex -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. --output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
! ENDIF(USE_GEN_EXPRESSIONS)
ADD_CUSTOM_TARGET(${_basename}_oct${DEBUGEXT} DEPENDS ${_o_FILE})
|
|
From: Axel R. <ro...@us...> - 2012-01-03 16:24:03
|
Update of /cvsroot/sdif/Easdif In directory vz-cvs-3.sog:/tmp/cvs-serv24502 Modified Files: README Log Message: Improved doc. Index: README =================================================================== RCS file: /cvsroot/sdif/Easdif/README,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** README 28 Mar 2011 23:13:07 -0000 1.18 --- README 3 Jan 2012 16:24:01 -0000 1.19 *************** *** 149,160 **** $> make install ATTENTION: the mex script is often masked by the mex binary of the tex program suite. If cmake finds the mex of tex first in its path it will not be able to run correctly. In this case you have to either change ! your PATH or specify the mex binary on the command line. For the octave compile script mkoctfile there exists a similar syntax ! $> cmake -DOCT:STRING=/path_to_mkoctfile -DEASDIF_BUILD_MEX:BOOL=on path_to_top_level_easdif_dir $> make oct $> make install --- 149,173 ---- $> make install + Example for the directory structure + + build_EASDIF/ + EASDIF_SDIF/ + + $> cd build_EASDIF + $> cmake -DMEX:STRING=/Applications/MATLAB_R2010a.app/bin/mex -DEASDIF_BUILD_MEX:BOOL=on ../EASDIF_SDIF + $> make mex + $> make install + + ATTENTION: the mex script is often masked by the mex binary of the tex program suite. If cmake finds the mex of tex first in its path it will not be able to run correctly. In this case you have to either change ! your PATH or specify the mex script on the command line as shown above. ! ! For the octave compile script mkoctfile there exists a similar syntax ! $> cmake -DMKOCT:STRING=/path_to_mkoctfile -DEASDIF_BUILD_MEX:BOOL=on path_to_top_level_easdif_dir $> make oct $> make install *************** *** 175,179 **** architecture according to the Matlab you are using. You find your matlab architecture by issuing mexext on the matlab comand line. If ! you get mexmaci you should use -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 and in case you get mexmaci --- 188,192 ---- architecture according to the Matlab you are using. You find your matlab architecture by issuing mexext on the matlab comand line. If ! you get mexmaci64 you should use -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 and in case you get mexmaci *************** *** 195,201 **** information look into swig/README. - For the moment the automake/autotools build configuration is still - supported. For generic instructions look into the file INSTALL. - # Documentation --- 208,211 ---- |
|
From: Axel R. <ro...@us...> - 2012-01-03 01:28:42
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv13660/swig/python
Modified Files:
CMakeLists.txt setup.py.in
Log Message:
Added python install target.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CMakeLists.txt 3 Jan 2012 00:51:28 -0000 1.10
--- CMakeLists.txt 3 Jan 2012 01:28:40 -0000 1.11
***************
*** 59,62 ****
--- 59,73 ----
COMMAND ${LOADPATH}=$(CMAKE_BINARY_DIR)/lib ${PYTHON} ${CMAKE_CURRENT_BINARY_DIR}/test.py)
ADD_DEPENDENCIES(checkswig pythonswig)
+ ADD_CUSTOM_TARGET(install_python_module_locally
+ COMMENT install python swig interface into userbase
+ COMMAND ${PYTHON} setup.py install --user
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ ADD_DEPENDENCIES(install_python_module_locally pythonswig)
+ ADD_CUSTOM_TARGET(install_python_module_globally
+ COMMENT install python swig interface into userbase
+ COMMAND ${PYTHON} setup.py install
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+ ADD_DEPENDENCIES(install_python_module_globally pythonswig)
ENDIF(PYTHON)
Index: setup.py.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/setup.py.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.py.in 3 Jan 2012 01:15:06 -0000 1.2
--- setup.py.in 3 Jan 2012 01:28:40 -0000 1.3
***************
*** 10,14 ****
url='http://sourceforge.net/projects/sdif/',
py_modules=['eaSDIF'],
! licence='LGPL'
data_files=[('lib/python${PYTHON_VERSION}/site-packages', ['${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/_eaSDIF.so'])],
)
--- 10,14 ----
url='http://sourceforge.net/projects/sdif/',
py_modules=['eaSDIF'],
! license='LGPL',
data_files=[('lib/python${PYTHON_VERSION}/site-packages', ['${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/_eaSDIF.so'])],
)
|
|
From: Axel R. <ro...@us...> - 2012-01-03 01:15:08
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv11287
Modified Files:
setup.py.in
Log Message:
Updated info.
Index: setup.py.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/setup.py.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup.py.in 3 Jan 2012 00:51:28 -0000 1.1
--- setup.py.in 3 Jan 2012 01:15:06 -0000 1.2
***************
*** 7,13 ****
description='SDIF file handling support for python',
author='Numerous',
! author_email='sdif@',
! url='http://www.python.org/sigs/distutils-sig/',
py_modules=['eaSDIF'],
data_files=[('lib/python${PYTHON_VERSION}/site-packages', ['${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/_eaSDIF.so'])],
)
--- 7,14 ----
description='SDIF file handling support for python',
author='Numerous',
! author_email='sd...@ir...',
! url='http://sourceforge.net/projects/sdif/',
py_modules=['eaSDIF'],
+ licence='LGPL'
data_files=[('lib/python${PYTHON_VERSION}/site-packages', ['${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/_eaSDIF.so'])],
)
|
|
From: Axel R. <ro...@us...> - 2012-01-03 00:51:30
|
Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv6076/swig/python
Modified Files:
CMakeLists.txt
Added Files:
setup.py.in
Log Message:
Improved flexibility of swig python configuration.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CMakeLists.txt 30 Apr 2007 11:34:59 -0000 1.9
--- CMakeLists.txt 3 Jan 2012 00:51:28 -0000 1.10
***************
*** 1,6 ****
FIND_PROGRAM(PYTHON python)
! FIND_PACKAGE(PythonLibs)
! IF( EXISTS ${PYTHON_INCLUDE_PATH})
! INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
SET(BUILD_WITH_INSTALL_RPATH ON)
--- 1,26 ----
FIND_PROGRAM(PYTHON python)
! MESSAGE(STATUS "python executable ${PYTHON}")
! IF(PYTHON)
! EXECUTE_PROCESS(COMMAND ${PYTHON}-config --ldflags OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE)
! SET(PYTHON_LIBRARY ${out})
! EXECUTE_PROCESS(COMMAND ${PYTHON}-config --includes OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE)
! STRING(REGEX REPLACE "[ \t]+" ";" PYTHON_INCLUDE_PATH ${out})
! MESSAGE(STATUS "Python includes <${PYTHON_INCLUDE_PATH}>")
! LIST(REMOVE_DUPLICATES PYTHON_INCLUDE_PATH)
! IF(DEBUG)
! MESSAGE(STATUS "Python library ${PYTHON_LIBRARY}")
! MESSAGE(STATUS "Python includes <${PYTHON_INCLUDE_PATH}>")
! ENDIF(DEBUG)
! FOREACH(PP ${PYTHON_INCLUDE_PATH})
! IF(DEBUG)
! MESSAGE("pp ${PP}")
! ENDIF(DEBUG)
! STRING(REGEX REPLACE "-I" "" PPP ${PP})
! INCLUDE_DIRECTORIES("${PPP}")
! ENDFOREACH(PP ${PYTHON_INCLUDE_PATH})
!
! EXECUTE_PROCESS(COMMAND ${PYTHON} --version OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE)
! STRING(REGEX REPLACE "[a-zA-Z0-9 \t]* \([0-9]+[.][0-9]+\).*" "\\1" PYTHON_VERSION ${err})
! MESSAGE(STATUS "PYTHON_VERSION ${PYTHON_VERSION}")
SET(BUILD_WITH_INSTALL_RPATH ON)
***************
*** 11,15 ****
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif${DEBUGEXT})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
--- 31,35 ----
SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}")
SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} )
! SWIG_LINK_LIBRARIES(eaSDIF Easdif_static${DEBUGEXT} ${PYTHON_LIBRARY})
ADD_CUSTOM_TARGET(pythonswig)
ADD_DEPENDENCIES(pythonswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
***************
*** 17,42 ****
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/example.py ${CMAKE_CURRENT_BINARY_DIR}/example.py)
! IF(EXISTS ${PYTHON})
! IF(APPLE)
! SET(LOADPATH DYLD_LIBRARY_PATH)
! ELSE (APPLE)
! IF(WIN32)
! SET(LOADPATH PATH)
! ELSE(WIN32)
! IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
! SET(LOADPATH LD_LIBRARY_PATH)
! ENDIF( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
! IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
! SET(LOADPATH DYLD_LIBRARY_PATH)
! ENDIF( "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
! ENDIF(WIN32)
! ENDIF(APPLE)
!
! ADD_CUSTOM_TARGET(checkswig
! COMMAND echo Testing python swig interface
! COMMAND ${LOADPATH}=$(CMAKE_BINARY_DIR)/easdif ${PYTHON} ${CMAKE_CURRENT_BINARY_DIR}/test.py)
! ADD_DEPENDENCIES(checkswig pythonswig)
! ENDIF(EXISTS ${PYTHON})
! ENDIF(EXISTS ${PYTHON_INCLUDE_PATH})
--- 37,62 ----
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/example.py ${CMAKE_CURRENT_BINARY_DIR}/example.py)
+
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
! IF(APPLE)
! SET(LOADPATH DYLD_LIBRARY_PATH)
! ELSE (APPLE)
! IF(WIN32)
! SET(LOADPATH PATH)
! ELSE(WIN32)
! IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
! SET(LOADPATH LD_LIBRARY_PATH)
! ENDIF( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
! IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
! SET(LOADPATH DYLD_LIBRARY_PATH)
! ENDIF( "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
! ENDIF(WIN32)
! ENDIF(APPLE)
!
! ADD_CUSTOM_TARGET(checkswig
! COMMAND echo Testing python swig interface
! COMMAND ${LOADPATH}=$(CMAKE_BINARY_DIR)/lib ${PYTHON} ${CMAKE_CURRENT_BINARY_DIR}/test.py)
! ADD_DEPENDENCIES(checkswig pythonswig)
! ENDIF(PYTHON)
--- NEW FILE: setup.py.in ---
#!/usr/bin/env ${PYTHON}
from distutils.core import setup
setup(name='eaSDIF',
version='1.4.15',
description='SDIF file handling support for python',
author='Numerous',
author_email='sdif@',
url='http://www.python.org/sigs/distutils-sig/',
py_modules=['eaSDIF'],
data_files=[('lib/python${PYTHON_VERSION}/site-packages', ['${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/_eaSDIF.so'])],
)
|
|
From: Axel R. <ro...@us...> - 2012-01-02 23:55:12
|
Update of /cvsroot/sdif/Easdif In directory vz-cvs-3.sog:/tmp/cvs-serv25860 Modified Files: CMakeLists.txt Log Message: Added missing call to SET_COMPILER_FLAGS. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** CMakeLists.txt 19 Dec 2011 17:57:50 -0000 1.71 --- CMakeLists.txt 2 Jan 2012 23:55:10 -0000 1.72 *************** *** 166,169 **** --- 166,171 ---- ## Configure SDIF + INCLUDE(SET_COMPILER_FLAGS) + MESSAGE(STATUS "CHECK FOR HEADERS") INCLUDE(CheckIncludeFile) |
|
From: Axel R. <ro...@us...> - 2012-01-02 23:51:53
|
Update of /cvsroot/sdif/Easdif/matlab
In directory vz-cvs-3.sog:/tmp/cvs-serv24367/matlab
Modified Files:
CMakeLists.txt
Log Message:
Updated for windows/Visual C++ compatibility.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/matlab/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CMakeLists.txt 12 Jul 2011 13:21:42 -0000 1.11
--- CMakeLists.txt 2 Jan 2012 23:51:51 -0000 1.12
***************
*** 34,38 ****
MESSAGE(STATUS "mex command ${MEX} cannot be run, error ${res} '${err}' skipping mex\n make sure this is not the mex program from the tex distribution.")
ELSE (res)
! STRING(REGEX REPLACE ".*LDEXTENSION[ \t]*=[ \t]*\([^ \t\n\r]*).*" "\\1" MEXEXT ${out})
IF( "${out}" MATCHES "-fexception" )
SET(EXCEPTIONFLAG)
--- 34,48 ----
MESSAGE(STATUS "mex command ${MEX} cannot be run, error ${res} '${err}' skipping mex\n make sure this is not the mex program from the tex distribution.")
ELSE (res)
! IF(NOT MEXEXT)
! STRING(REGEX REPLACE ".*cmake_tmp.mex\([a-z0-9]*).*" "\\1" MEXEXTSUF ${out})
! SET(MEXEXT ".mex${MEXEXTSUF}")
! IF(DEBUG)
! MESSAGE("MEXEXT SUF<${MEXEXTSUF}>")
! ENDIF(DEBUG)
! # STRING(REGEX REPLACE ".*LDEXTENSION[ \t]*=[ \t]*\([^ \t\n\r]*).*" "\\1" MEXEXT ${out})
! ENDIF(NOT MEXEXT)
!
! MESSAGE(STATUS "Use MEXEXT: <${MEXEXT}>")
!
IF( "${out}" MATCHES "-fexception" )
SET(EXCEPTIONFLAG)
***************
*** 50,56 ****
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- SET(COMPILER "\"CXX=${CMAKE_CXX_COMPILER}\"")
-
-
SET(CMAKE_SHARED_LIBRARY_PREFIX)
IF("${ARCH}" STREQUAL "x86_64" )
--- 60,63 ----
***************
*** 63,80 ****
SET(MEXFLAGS -g)
SET(COMPFLAGS CMAKE_CXX_FLAGS_DEBUG)
! SET(MEXFLAGBUILDTYPE CXXDEBUGFLAGS)
ELSE(${CMAKE_BUILD_TYPE} MATCHES "debug")
SET(MEXFLAGS -O)
SET(COMPFLAGS CMAKE_CXX_FLAGS_RELEASE)
! SET(MEXFLAGBUILDTYPE CXXOPTIMFLAGS)
ENDIF(${CMAKE_BUILD_TYPE} MATCHES "debug")
!
! STRING(REGEX REPLACE ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORIFLAGS ${out})
! STRING(REGEX REPLACE ".*[^L][^D]LDFLAGS[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORILDFLAGS ${out})
! STRING(REGEX REPLACE ".*[^L][^D]LDCXXFLAGS[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORILDCXXFLAGS ${out})
!
! SET(CMAKE_CXX_FLAGS_RELEASE "CXXOPTIMFLAGS=${MEXORIFLAGS} ${CMAKE_CXX_ADD_FLAGS_RELEASE} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
! SET(CMAKE_CXX_FLAGS_DEBUG "CXXDEBUGFLAGS=${MEXORIFLAGS} -O0 -fno-inline -fno-default-inline ${CMAKE_CXX_ADD_FLAGS_DEBUG} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
! SET(CMAKE_CXX_LINK_FLAGS "LDFLAGS=$(EXTRALDFLAGS) ${MATMTL_LFLAGS} -shared -lstdc++" ${COMPILER})
IF(DEBUG)
MESSAGE(STATUS "CMAKE_SHARED_LIBRARY_C_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
--- 70,116 ----
SET(MEXFLAGS -g)
SET(COMPFLAGS CMAKE_CXX_FLAGS_DEBUG)
! IF(WIN32)
! SET(MEXFLAGBUILDTYPE DEBUGFLAGS)
! ELSE(WIN32)
! SET(MEXFLAGBUILDTYPE CXXDEBUGFLAGS)
! ENDIF(WIN32)
ELSE(${CMAKE_BUILD_TYPE} MATCHES "debug")
SET(MEXFLAGS -O)
SET(COMPFLAGS CMAKE_CXX_FLAGS_RELEASE)
! IF(WIN32)
! SET(MEXFLAGBUILDTYPE OPTIMFLAGS)
! ELSE(WIN32)
! SET(MEXFLAGBUILDTYPE CXXOPTIMFLAGS)
! ENDIF(WIN32)
ENDIF(${CMAKE_BUILD_TYPE} MATCHES "debug")
!
! IF(WIN32)
! SET(COMPILER_SELECTOR_VAR "COMPILER")
! ELSE(WIN32)
! SET(COMPILER_SELECTOR_VAR "CXX")
! ENDIF(WIN32)
!
! IF("${out}" MATCHES ".*->[ \t]*MATLAB[ \t]*=[ \t]*\([^\n\r]*\).*")
! STRING(REGEX REPLACE ".*->[ \t]*MATLAB[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MATLAB_COMMAND ${out})
! MESSAGE(STATUS "Configuring for ${MATLAB_COMMAND}")
! ENDIF("${out}" MATCHES ".*->[ \t]*MATLAB[ \t]*=[ \t]*\([^\n\r]*\).*")
! IF("${out}" MATCHES ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*")
! STRING(REGEX REPLACE ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*" "\\1" MEXORIFLAGS ${out})
! ELSE("${out}" MATCHES ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*")
! MESSAGE(warning "cannot determine original mex compiler flags for ${MEXFLAGBUILDTYPE}, will try none")
! SET(MEXORIFLAGS)
! ENDIF("${out}" MATCHES ".*[^L][^D]${MEXFLAGBUILDTYPE}[ \t]*=[ \t]*\([^\n\r]*\).*")
!
! IF(${CMAKE_BUILD_TYPE} MATCHES "debug")
!
! SET(MEX_CXX_FLAGS "${MEXFLAGBUILDTYPE}=${MEXORIFLAGS} ${CMAKE_CXX_ADD_FLAGS_RELEASE} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
! ELSE(${CMAKE_BUILD_TYPE} MATCHES "debug")
! IF(CMAKE_COMPILER_IS_GNUCXX)
! SET(MEX_CXX_FLAGS "${MEXFLAGBUILDTYPE}=${MEXORIFLAGS} -O0 -fno-inline -fno-default-inline ${CMAKE_CXX_ADD_FLAGS_DEBUG} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
! ELSE(CMAKE_COMPILER_IS_GNUCXX)
! SET(MEX_CXX_FLAGS "${MEXFLAGBUILDTYPE}=${MEXORIFLAGS} ${CMAKE_CXX_ADD_FLAGS_DEBUG} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
! ENDIF(CMAKE_COMPILER_IS_GNUCXX)
! ENDIF(${CMAKE_BUILD_TYPE} MATCHES "debug")
!
IF(DEBUG)
MESSAGE(STATUS "CMAKE_SHARED_LIBRARY_C_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
***************
*** 88,94 ****
SET(ADDCFLAGS "-DEASDIF_MATLAB_VERSION=${EASDIF_MATLAB_VERSION_MAJ}.${EASDIF_MATLAB_VERSION_MIN}.${EASDIF_MATLAB_VERSION_REL} -DEASDIF_IS_STATIC")
! IF(GCC_HAS_VISIBILITY)
SET(ADDCFLAGS "${ADDCFLAGS} -DGCC_HAS_VISIBILITY -fvisibility=hidden")
! ENDIF(GCC_HAS_VISIBILITY)
ADD_CUSTOM_TARGET(mex)
--- 124,130 ----
SET(ADDCFLAGS "-DEASDIF_MATLAB_VERSION=${EASDIF_MATLAB_VERSION_MAJ}.${EASDIF_MATLAB_VERSION_MIN}.${EASDIF_MATLAB_VERSION_REL} -DEASDIF_IS_STATIC")
! IF(CMAKE_COMPILER_IS_GNUCXX AND GCC_HAS_VISIBILITY)
SET(ADDCFLAGS "${ADDCFLAGS} -DGCC_HAS_VISIBILITY -fvisibility=hidden")
! ENDIF(CMAKE_COMPILER_IS_GNUCXX AND GCC_HAS_VISIBILITY)
ADD_CUSTOM_TARGET(mex)
***************
*** 101,110 ****
SET(_o_FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_basename}${DEBUGEXT}${MEXEXT})
! # MESSAGE(STATUS "_current_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} _o_FILE ${_o_FILE}")
SET(INSTALL_MEX_FILES ${INSTALL_MEX_FILES} ${_o_FILE})
ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
COMMAND echo "Processing: ${_current_FILE}"
COMMAND
! ${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} "CXX=${CMAKE_CXX_COMPILER}" "${${COMPFLAGS}} ${ADDCFLAGS}" "LDFLAGS=${MEXORILDFLAGS}" "LDCXXFLAGS=${MEXORILDCXXFLAGS}" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
--- 137,149 ----
SET(_o_FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_basename}${DEBUGEXT}${MEXEXT})
! # MESSAGE(STATUS "_current_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} _o_FILE ${_o_FILE}")
SET(INSTALL_MEX_FILES ${INSTALL_MEX_FILES} ${_o_FILE})
+ IF(DEBUG)
+ MESSAGE("ADD CUSTOM COMMAND ::${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} \"${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}\" \"${MEX_CXX_FLAGS} ${ADDCFLAGS}\" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}::")
+ ENDIF(DEBUG)
ADD_CUSTOM_COMMAND(OUTPUT ${_o_FILE}
COMMAND echo "Processing: ${_current_FILE}"
COMMAND
! ${MEX} ${MEXFLAGS} -v ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} "${COMPILER_SELECTOR_VAR}=${CMAKE_CXX_COMPILER}" "${MEX_CXX_FLAGS} ${ADDCFLAGS}" -I${CMAKE_CURRENT_BINARY_DIR}/../SDIF/sdifconfig -I${CMAKE_CURRENT_BINARY_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/include -I${CMAKE_CURRENT_SOURCE_DIR}/.. -output ${_o_FILE} -L${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} -lEasdif_static_pic${DEBUGEXT}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${DEP_INCLUDES} Easdif_static_pic${DEBUGEXT})
***************
*** 177,180 ****
--- 216,221 ----
${CMAKE_CURRENT_SOURCE_DIR}/Fsdifread.m
${CMAKE_CURRENT_SOURCE_DIR}/Fsdifexist.m
+ ${CMAKE_CURRENT_SOURCE_DIR}/Fsdifclearall.m
+ ${CMAKE_CURRENT_SOURCE_DIR}/Fsdifrewind.m
${CMAKE_CURRENT_SOURCE_DIR}/Fsdifloadfile.m)
|
|
From: Axel R. <ro...@us...> - 2012-01-02 23:49:48
|
Update of /cvsroot/sdif/Easdif/easdif In directory vz-cvs-3.sog:/tmp/cvs-serv24111/easdif Modified Files: easdif_exports.hpp Log Message: Base selection of WIN32 specific implementation on definition of macros WIN32 OR _WIN32. The latter being standard in Visual C++ it is most important to have it. Index: easdif_exports.hpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/easdif_exports.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** easdif_exports.hpp 7 Mar 2008 19:17:40 -0000 1.2 --- easdif_exports.hpp 2 Jan 2012 23:49:46 -0000 1.3 *************** *** 31,35 **** # define EASDIF_API #else ! # ifdef WIN32 # ifdef DO_EXPORT_SDIF # define EASDIF_API __declspec(dllexport) --- 31,35 ---- # define EASDIF_API #else ! # if defined( _WIN32) || defined(WIN32) # ifdef DO_EXPORT_SDIF # define EASDIF_API __declspec(dllexport) |
|
From: Axel R. <ro...@us...> - 2012-01-02 23:49:11
|
Update of /cvsroot/sdif/SDIF/tools
In directory vz-cvs-3.sog:/tmp/cvs-serv24018/SDIF/tools
Modified Files:
sdifextract.c
Log Message:
Base selection of WIN32 specific implementation on definition of macros WIN32 OR _WIN32. The latter being standard in
Visual C++ it is most important to have it.
Index: sdifextract.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/tools/sdifextract.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sdifextract.c 3 May 2006 15:47:25 -0000 1.17
--- sdifextract.c 2 Jan 2012 23:49:08 -0000 1.18
***************
*** 14,17 ****
--- 14,21 ----
$Log$
+ Revision 1.18 2012/01/02 23:49:08 roebel
+ Base selection of WIN32 specific implementation on definition of macros WIN32 OR _WIN32. The latter being standard in
+ Visual C++ it is most important to have it.
+
Revision 1.17 2006/05/03 15:47:25 schwarz
added data only output option
***************
*** 176,180 ****
#elif defined(HOST_OS_MAC)
#include <unistd.h>
! #elif defined(WIN32)
#include <io.h>
#endif
--- 180,184 ----
#elif defined(HOST_OS_MAC)
#include <unistd.h>
! #elif defined(HOST_OS_WIN32)
#include <io.h>
#endif
|
|
From: Axel R. <ro...@us...> - 2011-12-19 17:57:53
|
Update of /cvsroot/sdif/Easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv22332
Modified Files:
ChangeLog CMakeLists.txt
Log Message:
Version 1.4.15
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** CMakeLists.txt 11 Jun 2011 17:15:17 -0000 1.70
--- CMakeLists.txt 19 Dec 2011 17:57:50 -0000 1.71
***************
*** 40,44 ****
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 14)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
--- 40,44 ----
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 15)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sdif/Easdif/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** ChangeLog 11 Jun 2011 17:15:17 -0000 1.84
--- ChangeLog 19 Dec 2011 17:57:50 -0000 1.85
***************
*** 1,2 ****
--- 1,12 ----
+ 2011-12-19 Axel Roebel <ro...@m1...>
+ Version 1.4.15
+
+ * link with sdif 3.11.4:
+ fixes problem in reading 1NVT matrices not containing a \000 at the end.
+
+ * matlab/Fsdif_read_handler.cpp, matlab/Fsdifloadfile.m:
+ Properly handle matrices with 0 rows.
+ Support Fsdifloadfile to force output type.
+
2011-06-11 Axel Roebel <roebel@m1873.local>
Version 1.4.14
|
