diff --git a/mathmech/AUTHORS b/mathmech/AUTHORS new file mode 100644 index 0000000..2c0d60a --- /dev/null +++ b/mathmech/AUTHORS @@ -0,0 +1,3 @@ +Current developers: + +Evgeniy Alekseev aka arcanis diff --git a/mathmech/CMakeLists.txt b/mathmech/CMakeLists.txt index ec40a43..d62b36b 100644 --- a/mathmech/CMakeLists.txt +++ b/mathmech/CMakeLists.txt @@ -1,6 +1,6 @@ set ("PROJECT_VERSION_MAJOR" 1) set ("PROJECT_VERSION_MINOR" 0) -set ("PROJECT_VERSION_PATCH" 2) +set ("PROJECT_VERSION_PATCH" 3) set ("PROJECT_VERSION" ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) message (STATUS "Version ${PROJECT_VERSION}") @@ -15,10 +15,13 @@ set (COMPS mathmech # install options set (MM_PREFIX "mm_" CACHE STRING "Prefix for mathmech tools") -if (CMAKE_COMPILER_IS_GNUCXX) +OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) +OPTION (ADD_INCLUDE "Add include files" OFF) +OPTION (ADD_DOCS "Add documentation" OFF) +if (CMAKE_SYSTEM_NAME MATCHES Linux) set (QWT_INCLUDE_PATH "/usr/include" CACHE STRING "Path to qwt include") set (QWT_LIBRARY_PATH "/usr/lib" CACHE STRING "Path to qwt library") -else () +elseif (CMAKE_SYSTEM_NAME MATCHES Windows) set (QWT_INCLUDE_PATH "C:/Qwt-6.1.0/include" CACHE STRING "Path to qwt include") set (QWT_LIBRARY_PATH "C:/Qwt-6.1.0/lib" CACHE STRING "Path to qwt library") endif() diff --git a/mathmech/COPYING b/mathmech/COPYING new file mode 100644 index 0000000..eb47f5d --- /dev/null +++ b/mathmech/COPYING @@ -0,0 +1,341 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/mathmech/INSTALL b/mathmech/INSTALL new file mode 100644 index 0000000..76160fc --- /dev/null +++ b/mathmech/INSTALL @@ -0,0 +1,19 @@ +CMakeFlags: + -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') + -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) + -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components + -DQWT_INCLUDE_PATH - path to qwt includes + -DQWT_LIBRARY_PATH - path to qwt library + +Install for Linux: + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../ + make + make install +Install for Windows: + create project file using 'cmake' + compile project + copy QtCore4.dll, QtGui4.dll, QtOpenGL4.dll, QtSvg4.dll, qwt.dll to directory with mathmech +You may also download compiled executable file for Win_x86. diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD index 988890a..523b982 100644 --- a/mathmech/PKGBUILD +++ b/mathmech/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Evgeniy "arcanis" Alexeev pkgname=mathmech -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Software package for analysis of molecular dynamics trajectories" arch=(any) @@ -11,7 +11,7 @@ license=('GPL') depends=('qt4' 'qwt') makedepends=('unzip' 'cmake' 'automoc4') source=(https://github.com/arcan1s/moldyn/releases/download/mm-${pkgver}/${pkgname}-${pkgver}-src.zip) -md5sums=('7c80789a74255108581583830258fe1c') +md5sums=('4eccb72efd4a8a531d7fda1aabc04f62') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DQWT_INCLUDE_PATH=/usr/include/qwt -DMM_PREFIX=mm_ diff --git a/mathmech/mathmech-1.0.2-src.zip b/mathmech/mathmech-1.0.2-src.zip deleted file mode 100644 index 579d518..0000000 Binary files a/mathmech/mathmech-1.0.2-src.zip and /dev/null differ diff --git a/mathmech/mathmech-1.0.3-src.zip b/mathmech/mathmech-1.0.3-src.zip new file mode 100644 index 0000000..02ae2fb Binary files /dev/null and b/mathmech/mathmech-1.0.3-src.zip differ diff --git a/mathmech/mathmech-1.0.2-win32.zip b/mathmech/mathmech-1.0.3-win32.zip similarity index 97% rename from mathmech/mathmech-1.0.2-win32.zip rename to mathmech/mathmech-1.0.3-win32.zip index 7d7a010..2655135 100755 Binary files a/mathmech/mathmech-1.0.2-win32.zip and b/mathmech/mathmech-1.0.3-win32.zip differ diff --git a/mathmech/mathmech/CMakeLists.txt b/mathmech/mathmech/CMakeLists.txt index d3528a4..6e94e6e 100644 --- a/mathmech/mathmech/CMakeLists.txt +++ b/mathmech/mathmech/CMakeLists.txt @@ -12,7 +12,6 @@ include (${PROJECT}.cmake) # additional options OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) # set libraries set (LIBRARIES) diff --git a/mathmech/mathmech/INSTALL b/mathmech/mathmech/INSTALL index cbd6143..d795c98 100644 --- a/mathmech/mathmech/INSTALL +++ b/mathmech/mathmech/INSTALL @@ -1,7 +1,8 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') - -DADD_INCLUDE=1 - install include files (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DQWT_INCLUDE_PATH - path to qwt includes + -DQWT_LIBRARY_PATH - path to qwt library Install for Linux: mkdir build && cd build @@ -11,4 +12,5 @@ Install for Linux: Install for Windows: create project file using 'cmake' compile project + copy QtCore4.dll, QtGui4.dll, QtOpenGL4.dll, QtSvg4.dll, qwt.dll to directory with mathmech You may also download compiled executable file for Win_x86. diff --git a/mathmech/mathmech/README b/mathmech/mathmech/README index 9de3ce9..3e5348f 100644 --- a/mathmech/mathmech/README +++ b/mathmech/mathmech/README @@ -1,3 +1,3 @@ Mathematical Molecular Mechanics is GUI for "mm" program pack -Version: 1.0.2 +Version: 1.0.3 License: GPL diff --git a/mathmech/mathmech/mathmech.png b/mathmech/mathmech/mathmech.png new file mode 100755 index 0000000..515208d Binary files /dev/null and b/mathmech/mathmech/mathmech.png differ diff --git a/mathmech/mathmech/resources/mathmech.ico b/mathmech/mathmech/resources/mathmech.ico new file mode 100644 index 0000000..913aca2 Binary files /dev/null and b/mathmech/mathmech/resources/mathmech.ico differ diff --git a/mathmech/mathmech/resources/res_icon.rc b/mathmech/mathmech/resources/res_icon.rc new file mode 100644 index 0000000..25e5c53 --- /dev/null +++ b/mathmech/mathmech/resources/res_icon.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "mathmech.ico" diff --git a/mathmech/mathmech/resources/translations/eng.qm b/mathmech/mathmech/resources/translations/eng.qm new file mode 100644 index 0000000..0439d63 Binary files /dev/null and b/mathmech/mathmech/resources/translations/eng.qm differ diff --git a/mathmech/mathmech/resources/translations/rus.qm b/mathmech/mathmech/resources/translations/rus.qm new file mode 100644 index 0000000..1757a60 Binary files /dev/null and b/mathmech/mathmech/resources/translations/rus.qm differ diff --git a/mathmech/mathmech/src/CMakeLists.txt b/mathmech/mathmech/src/CMakeLists.txt index c07b2a0..7b98fe6 100644 --- a/mathmech/mathmech/src/CMakeLists.txt +++ b/mathmech/mathmech/src/CMakeLists.txt @@ -2,12 +2,15 @@ file (GLOB SOURCES *.cpp) file (GLOB HEADERS *.h) file (GLOB FORMS *.ui) +if (CMAKE_SYSTEM_NAME MATCHES Windows) + set (SOURCES ${SOURCES} ${PROJECT_RESOURCE_DIR}/res_icon.rc) +endif () # set library if (CMAKE_COMPILER_IS_GNUCXX) set (LIBRARIES m qwt) else () set (LIBRARIES qwt) -endif() +endif () set (LANGUAGES eng rus) @@ -61,7 +64,11 @@ target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRA # install properties install (TARGETS ${PROJECT} DESTINATION bin) -install (FILES ../mathmech.desktop - DESTINATION share/applications/) -install (FILES ../mathmech-logo.png - DESTINATION share/pixmaps/) +if (CMAKE_SYSTEM_NAME MATCHES Linux) + install (FILES ../mathmech.desktop + DESTINATION share/applications/) + install (FILES ../mathmech-logo.png + DESTINATION share/pixmaps/) + install (FILES ../mathmech.png + DESTINATION share/icons/hicolor/32x32/apps/) +endif () diff --git a/mathmech/mathmech/src/mainwindow.cpp b/mathmech/mathmech/src/mainwindow.cpp index 9ec62e2..e902fcc 100644 --- a/mathmech/mathmech/src/mainwindow.cpp +++ b/mathmech/mathmech/src/mainwindow.cpp @@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow), clear_items(new Clear_items(this)), update_fields(new Update_fields(this)) -{ +{ ui->setupUi(this); statgen_crit = new float[10]; diff --git a/mathmech/mathmech/src/mainwindow.ui b/mathmech/mathmech/src/mainwindow.ui index e2ce8c1..2bc2e0e 100644 --- a/mathmech/mathmech/src/mainwindow.ui +++ b/mathmech/mathmech/src/mainwindow.ui @@ -3715,14 +3715,6 @@ - - - TopToolBarArea - - - false - - diff --git a/mathmech/mathmech/src/mathmech.pro.user b/mathmech/mathmech/src/mathmech.pro.user index c91676d..e8a1d41 100644 --- a/mathmech/mathmech/src/mathmech.pro.user +++ b/mathmech/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/mathmech/mm_agl/CMakeLists.txt b/mathmech/mm_agl/CMakeLists.txt index ec5c278..a0656e7 100644 --- a/mathmech/mm_agl/CMakeLists.txt +++ b/mathmech/mm_agl/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}agl) +set (_PROJECT mm_agl) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_agl/INSTALL b/mathmech/mm_agl/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_agl/INSTALL +++ b/mathmech/mm_agl/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_agl/README b/mathmech/mm_agl/README index 4fe0ca4..e0ddd25 100644 --- a/mathmech/mm_agl/README +++ b/mathmech/mm_agl/README @@ -1,5 +1,5 @@ mm_agl - program that creates PDB file with chosen agglomerate -Version: 1.0.2 +Version: 1.0.3 License: GPL Usage: diff --git a/mathmech/mm_agl/mm_agl.cmake b/mathmech/mm_agl/mm_agl.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_agl/mm_agl.cmake +++ b/mathmech/mm_agl/mm_agl.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_agl/mm_agl.doxygen b/mathmech/mm_agl/mm_agl.doxygen index c8d1f30..69bd1f7 100644 --- a/mathmech/mm_agl/mm_agl.doxygen +++ b/mathmech/mm_agl/mm_agl.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_agl # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_agl/mm_agl.pdf b/mathmech/mm_agl/mm_agl.pdf index 56ad0de..58c462e 100644 Binary files a/mathmech/mm_agl/mm_agl.pdf and b/mathmech/mm_agl/mm_agl.pdf differ diff --git a/mathmech/mm_agl/src/CMakeLists.txt b/mathmech/mm_agl/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_agl/src/CMakeLists.txt +++ b/mathmech/mm_agl/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_agl/src/main.c b/mathmech/mm_agl/src/main.c index 1a3858f..03b4795 100644 --- a/mathmech/mm_agl/src/main.c +++ b/mathmech/mm_agl/src/main.c @@ -61,8 +61,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -128,7 +134,7 @@ int main(int argc, char *argv[]) { sprintf (tmp_str, " mm_agl\n"); sprintf (tmp_str, "%sProgram for create PDB file with chosen agglomerate\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/mm_envir/CMakeLists.txt b/mathmech/mm_envir/CMakeLists.txt index 54de975..a7ca1aa 100644 --- a/mathmech/mm_envir/CMakeLists.txt +++ b/mathmech/mm_envir/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}envir) +set (_PROJECT mm_envir) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_envir/INSTALL b/mathmech/mm_envir/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_envir/INSTALL +++ b/mathmech/mm_envir/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_envir/README b/mathmech/mm_envir/README index 0bc2d2d..6da3681 100644 --- a/mathmech/mm_envir/README +++ b/mathmech/mm_envir/README @@ -1,5 +1,5 @@ mm_envir - program that searchs environment for chosen molecule by geometric criterion -Version: 1.0.2 +Version: 1.0.3 License: GPL Usage: diff --git a/mathmech/mm_envir/mm_envir.cmake b/mathmech/mm_envir/mm_envir.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_envir/mm_envir.cmake +++ b/mathmech/mm_envir/mm_envir.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_envir/mm_envir.doxygen b/mathmech/mm_envir/mm_envir.doxygen index 3e688f0..295b016 100644 --- a/mathmech/mm_envir/mm_envir.doxygen +++ b/mathmech/mm_envir/mm_envir.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_envir # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_envir/mm_envir.pdf b/mathmech/mm_envir/mm_envir.pdf index 6991ba6..6eec094 100644 Binary files a/mathmech/mm_envir/mm_envir.pdf and b/mathmech/mm_envir/mm_envir.pdf differ diff --git a/mathmech/mm_envir/src/CMakeLists.txt b/mathmech/mm_envir/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_envir/src/CMakeLists.txt +++ b/mathmech/mm_envir/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_envir/src/main.c b/mathmech/mm_envir/src/main.c index 370a0ef..f4f1c35 100644 --- a/mathmech/mm_envir/src/main.c +++ b/mathmech/mm_envir/src/main.c @@ -63,8 +63,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -130,7 +136,7 @@ int main(int argc, char *argv[]) { sprintf (tmp_str, " mm_envir\n"); sprintf (tmp_str, "%sProgram for search environment for chosen molecule by geometric criterion\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/mm_radf/CMakeLists.txt b/mathmech/mm_radf/CMakeLists.txt index 329e720..7b2a242 100644 --- a/mathmech/mm_radf/CMakeLists.txt +++ b/mathmech/mm_radf/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}radf) +set (_PROJECT mm_radf) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_radf/INSTALL b/mathmech/mm_radf/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_radf/INSTALL +++ b/mathmech/mm_radf/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_radf/README b/mathmech/mm_radf/README index 0e5e45e..f7086af 100644 --- a/mathmech/mm_radf/README +++ b/mathmech/mm_radf/README @@ -1,6 +1,6 @@ mm_radf - program that calculates radial distribution function (RDF) or radial-angles distribution function -Version : 1.0.2 +Version : 1.0.3 License : GPL Usage: diff --git a/mathmech/mm_radf/mm_radf.cmake b/mathmech/mm_radf/mm_radf.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_radf/mm_radf.cmake +++ b/mathmech/mm_radf/mm_radf.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_radf/mm_radf.doxygen b/mathmech/mm_radf/mm_radf.doxygen index e3c94d3..6ce1ec9 100644 --- a/mathmech/mm_radf/mm_radf.doxygen +++ b/mathmech/mm_radf/mm_radf.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_radf # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_radf/mm_radf.pdf b/mathmech/mm_radf/mm_radf.pdf index d14f4f9..13e8296 100644 Binary files a/mathmech/mm_radf/mm_radf.pdf and b/mathmech/mm_radf/mm_radf.pdf differ diff --git a/mathmech/mm_radf/src/CMakeLists.txt b/mathmech/mm_radf/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_radf/src/CMakeLists.txt +++ b/mathmech/mm_radf/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_radf/src/main.c b/mathmech/mm_radf/src/main.c index b97a242..7faee40 100644 --- a/mathmech/mm_radf/src/main.c +++ b/mathmech/mm_radf/src/main.c @@ -70,8 +70,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -147,7 +153,7 @@ int main(int argc, char *argv[]) sprintf (tmp_str, " mm_radf\n"); sprintf (tmp_str, "%sProgram that calculates radial distribution function (RDF) or radial-angles\n", tmp_str); sprintf (tmp_str, "%sdistribution function\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/mm_statgen/CMakeLists.txt b/mathmech/mm_statgen/CMakeLists.txt index a9191e9..7a65536 100644 --- a/mathmech/mm_statgen/CMakeLists.txt +++ b/mathmech/mm_statgen/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}statgen) +set (_PROJECT mm_statgen) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_statgen/INSTALL b/mathmech/mm_statgen/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_statgen/INSTALL +++ b/mathmech/mm_statgen/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_statgen/README b/mathmech/mm_statgen/README index 1807ba2..de1503d 100644 --- a/mathmech/mm_statgen/README +++ b/mathmech/mm_statgen/README @@ -1,5 +1,5 @@ mm_statgen - program that analyzes molecular dynamic trajectories using topological analysis -Version: 1.0.2 +Version: 1.0.3 License: GPL Usage: diff --git a/mathmech/mm_statgen/mm_statgen.cmake b/mathmech/mm_statgen/mm_statgen.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_statgen/mm_statgen.cmake +++ b/mathmech/mm_statgen/mm_statgen.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_statgen/mm_statgen.doxygen b/mathmech/mm_statgen/mm_statgen.doxygen index afee005..b50b5b2 100644 --- a/mathmech/mm_statgen/mm_statgen.doxygen +++ b/mathmech/mm_statgen/mm_statgen.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_statgen # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_statgen/mm_statgen.pdf b/mathmech/mm_statgen/mm_statgen.pdf index 010fdf9..35bcf02 100644 Binary files a/mathmech/mm_statgen/mm_statgen.pdf and b/mathmech/mm_statgen/mm_statgen.pdf differ diff --git a/mathmech/mm_statgen/src/CMakeLists.txt b/mathmech/mm_statgen/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_statgen/src/CMakeLists.txt +++ b/mathmech/mm_statgen/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_statgen/src/main.c b/mathmech/mm_statgen/src/main.c index b0ea24e..28b7d3f 100644 --- a/mathmech/mm_statgen/src/main.c +++ b/mathmech/mm_statgen/src/main.c @@ -66,8 +66,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -162,7 +168,7 @@ int main (int argc, char *argv[]) { sprintf (tmp_str, " mm_statgen\n"); sprintf (tmp_str, "%sProgram for analyze molecular dynamic trajectories\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/mm_trj/CMakeLists.txt b/mathmech/mm_trj/CMakeLists.txt index eb7df44..37d03c3 100644 --- a/mathmech/mm_trj/CMakeLists.txt +++ b/mathmech/mm_trj/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}trj) +set (_PROJECT mm_trj) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_trj/INSTALL b/mathmech/mm_trj/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_trj/INSTALL +++ b/mathmech/mm_trj/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_trj/README b/mathmech/mm_trj/README index fffe251..e75dbe0 100644 --- a/mathmech/mm_trj/README +++ b/mathmech/mm_trj/README @@ -1,5 +1,5 @@ mm_trj - program that generates trajectory files -Version : 1.0.2 +Version : 1.0.3 License : GPL Usage: diff --git a/mathmech/mm_trj/mm_trj.cmake b/mathmech/mm_trj/mm_trj.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_trj/mm_trj.cmake +++ b/mathmech/mm_trj/mm_trj.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_trj/mm_trj.doxygen b/mathmech/mm_trj/mm_trj.doxygen index d3263ea..79f3365 100644 --- a/mathmech/mm_trj/mm_trj.doxygen +++ b/mathmech/mm_trj/mm_trj.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_trj # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_trj/mm_trj.pdf b/mathmech/mm_trj/mm_trj.pdf index 28b4760..b22aef8 100644 Binary files a/mathmech/mm_trj/mm_trj.pdf and b/mathmech/mm_trj/mm_trj.pdf differ diff --git a/mathmech/mm_trj/src/CMakeLists.txt b/mathmech/mm_trj/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_trj/src/CMakeLists.txt +++ b/mathmech/mm_trj/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_trj/src/main.c b/mathmech/mm_trj/src/main.c index 85c53d0..f2f78f1 100644 --- a/mathmech/mm_trj/src/main.c +++ b/mathmech/mm_trj/src/main.c @@ -63,8 +63,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -127,7 +133,7 @@ int main(int argc, char *argv[]) { sprintf (tmp_str, " mm_trj\n"); sprintf (tmp_str, "%sProgram that generates trajectory files\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/mm_trj2pdb/CMakeLists.txt b/mathmech/mm_trj2pdb/CMakeLists.txt index 81cad11..62429b6 100644 --- a/mathmech/mm_trj2pdb/CMakeLists.txt +++ b/mathmech/mm_trj2pdb/CMakeLists.txt @@ -6,13 +6,9 @@ cmake_policy(SET CMP0015 NEW) # set project name set (PROJECT ${MM_PREFIX}trj2pdb) +set (_PROJECT mm_trj2pdb) # set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) +include (${_PROJECT}.cmake) # set libraries set (LIBRARIES) diff --git a/mathmech/mm_trj2pdb/INSTALL b/mathmech/mm_trj2pdb/INSTALL index cbd6143..93ebd11 100644 --- a/mathmech/mm_trj2pdb/INSTALL +++ b/mathmech/mm_trj2pdb/INSTALL @@ -1,7 +1,9 @@ CMakeFlags: -DCMAKE_INSTALL_PREFIX= - install prefix (default is '/usr/local') -DADD_INCLUDE=1 - install include files (default is disable) + -DADD_DOCS=1 - install documentation (default is disable) -DWITH_DEBUG_MODE=1 - compile with flag '-g' (default is disable) + -DMM_PREFIX - prefix for mm components (test flag) Install for Linux: mkdir build && cd build diff --git a/mathmech/mm_trj2pdb/README b/mathmech/mm_trj2pdb/README index 7019ca5..981ef2e 100644 --- a/mathmech/mm_trj2pdb/README +++ b/mathmech/mm_trj2pdb/README @@ -1,5 +1,5 @@ mm_trj2pdb - program that creates PDB file from trajetory snapshot -Version: 1.0.2 +Version: 1.0.3 License: GPL Usage: diff --git a/mathmech/mm_trj2pdb/mm_trj2pdb.cmake b/mathmech/mm_trj2pdb/mm_trj2pdb.cmake index 2c0f3e2..36035e2 100644 --- a/mathmech/mm_trj2pdb/mm_trj2pdb.cmake +++ b/mathmech/mm_trj2pdb/mm_trj2pdb.cmake @@ -1,8 +1,8 @@ # set directories set (PROJECT_BINARY_DIR bin) -set (PROJECT_SOURCE_DIR src) -set (PROJECT_INCLUDE_DIR include) -set (PROJECT_LIB_DIR lib) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) # include_path include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} diff --git a/mathmech/mm_trj2pdb/mm_trj2pdb.doxygen b/mathmech/mm_trj2pdb/mm_trj2pdb.doxygen index f2facf9..d71fb8d 100644 --- a/mathmech/mm_trj2pdb/mm_trj2pdb.doxygen +++ b/mathmech/mm_trj2pdb/mm_trj2pdb.doxygen @@ -32,7 +32,7 @@ PROJECT_NAME = mm_trj2pdb # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = V.1.0.2 +PROJECT_NUMBER = V.1.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/mathmech/mm_trj2pdb/mm_trj2pdb.pdf b/mathmech/mm_trj2pdb/mm_trj2pdb.pdf index 565b6af..24688f5 100644 Binary files a/mathmech/mm_trj2pdb/mm_trj2pdb.pdf and b/mathmech/mm_trj2pdb/mm_trj2pdb.pdf differ diff --git a/mathmech/mm_trj2pdb/src/CMakeLists.txt b/mathmech/mm_trj2pdb/src/CMakeLists.txt index 76803b8..f5fc68a 100644 --- a/mathmech/mm_trj2pdb/src/CMakeLists.txt +++ b/mathmech/mm_trj2pdb/src/CMakeLists.txt @@ -19,4 +19,7 @@ target_link_libraries (${PROJECT} ${ADDITIONAL_LIB}) INSTALL (TARGETS ${PROJECT} DESTINATION bin) if (ADD_INCLUDE) INSTALL (FILES ${PUBLIC_HEADERS} DESTINATION include/${PROJECT}) -endif () \ No newline at end of file +endif () +if (ADD_DOCS) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/../${_PROJECT}.pdf DESTINATION share/doc/mathmech) +endif () diff --git a/mathmech/mm_trj2pdb/src/main.c b/mathmech/mm_trj2pdb/src/main.c index 685dd66..a6a6265 100644 --- a/mathmech/mm_trj2pdb/src/main.c +++ b/mathmech/mm_trj2pdb/src/main.c @@ -59,8 +59,14 @@ * You may also download compiled executable file for Win_x86. * * @page Changelog - * V.1.0.2 (2013-07-27) - * * initial release + * V.1.0.3 (2013-08-30) + *
    + *
  • Bug fixes + *
+ * V.1.0.1 (2013-07-27) + *
    + *
  • initial release + *
*/ #include @@ -119,7 +125,7 @@ int main(int argc, char *argv[]) { sprintf (tmp_str, " mm_trj2pdb\n"); sprintf (tmp_str, "%sProgram for create PDB file from trajectory snapshot\n", tmp_str); - sprintf (tmp_str, "%sVersion : 1.0.2 License : GPL\n", tmp_str); + sprintf (tmp_str, "%sVersion : 1.0.3 License : GPL\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str); diff --git a/mathmech/update_ver.sh b/mathmech/update_ver.sh index bc85740..b0cf426 100755 --- a/mathmech/update_ver.sh +++ b/mathmech/update_ver.sh @@ -38,11 +38,10 @@ fi # work block COMPONENTS=(mm_agl mm_envir mm_radf mm_statgen mm_trj mm_trj2pdb) for COMPONENT in ${COMPONENTS[*]}; do - sed -i "s:$OLDVER:$NEWVER:g" $COMPONENT/src/main.c - sed -i "s:$OLDVER:$NEWVER:g" $COMPONENT/README - sed -i "s:$OLDVER:$NEWVER:g" $COMPONENT/$COMPONENT.doxygen + sed -i "s/Version : $OLDVER/Version : $NEWVER/g" $COMPONENT/src/main.c + sed -i "s/Version: $OLDVER/Version: $NEWVER/g" $COMPONENT/README + sed -i "s/V.$OLDVER/V.$NEWVER/g" $COMPONENT/$COMPONENT.doxygen done COMPONENT=mathmech -sed -i "s:$OLDVER:$NEWVER:g" $COMPONENT/src/main.cpp -sed -i "s:$OLDVER:$NEWVER:g" $COMPONENT/README +sed -i "s/Version: $OLDVER/Version: $NEWVER/g" $COMPONENT/README