Skip to content

Commit

Permalink
Merge pull request #182 from sjoelund/fix-common-version
Browse files Browse the repository at this point in the history
Fix common submodule + version script
  • Loading branch information
sjoelund committed May 15, 2019
2 parents 2ab97af + c2d73c7 commit 75becfa
Show file tree
Hide file tree
Showing 18 changed files with 4,389 additions and 4 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,9 +1,6 @@
[submodule "OMOptim"]
path = OMOptim
url = ../OMOptim.git
[submodule "common"]
path = common
url = ../OpenModelica-common.git
[submodule "libraries"]
path = libraries
url = ../OMLibraries.git
Expand Down
1 change: 0 additions & 1 deletion common
Submodule common deleted from c9c908
11 changes: 11 additions & 0 deletions common/.gitattributes
@@ -0,0 +1,11 @@
*.c text eol=native
*.cpp text eol=native
*.h text eol=native
*.m4 text eol=native
.gitattributes text eol=native
.gitignore text eol=native
*.md text eol=native
LICENSE text eol=native
configure.ac text eol=native
Makefile* text eol=native
*.pro text eol=native
29 changes: 29 additions & 0 deletions common/LICENSE
@@ -0,0 +1,29 @@
Copyright (c) 2015, Open Source Modelica Consortium (OSMC)

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of OpenModelica-common nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

2 changes: 2 additions & 0 deletions common/README.md
@@ -0,0 +1,2 @@
# OpenModelica-common
Common files used by the OpenModelica repositories
14 changes: 14 additions & 0 deletions common/commit-msg.sh
@@ -0,0 +1,14 @@
#!/bin/sh
#
# Check style 52/70

if test `head -1 "$1" | wc -L` -gt 50; then
echo "Too long commit summary (leave an empty line after the first if it is not part of the summary)" >&2
exit 1
elif test `head -2 | tail -n +2 "$1" | wc -L` != 0; then
echo "Commit does not have an empty second line" >&2
exit 1
elif test `wc -L < "$1"` -gt 72; then
echo "Commit has too long commit lines (max 72 characters per line)" >&2
exit 1
fi

0 comments on commit 75becfa

Please sign in to comment.