diff --git a/CMakeLists.txt b/CMakeLists.txt index 426e32add6649be0a17b793722c25e9ae515f07e..15bd4de76f19c37f29fc08abb405096292e3fa9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ## e.g. add_subdirectory(src), subdirs have their own CMakeLists.txt add_subdirectory(config) add_subdirectory(core) -add_subdirectory(meld) +add_subdirectory(rawmodel) add_subdirectory(loop) add_subdirectory(scripts) add_subdirectory(actions) diff --git a/extras/pre-commit b/extras/pre-commit index c51d6d31ecbb88792358ff208b6dac4b00893b46..9ede84071e6b7fd70b78fc69ea1b9ce3f8c3cdf1 100755 --- a/extras/pre-commit +++ b/extras/pre-commit @@ -114,6 +114,8 @@ def GetFileType(filepath): return "cmake" if filepath.endswith('.pdb'): return "ukn" + if filepath.endswith('.fasta'): + return "ukn" try: fo = subprocess.check_output(['file', filepath], shell=False) except Exception, e: @@ -133,6 +135,8 @@ def GetFileType(filepath): return "shell-script" elif fo == "%s: ASCII C program text" % filepath: return "C" + elif fo == "%s: SQLite 3.x database" % filepath: + return "ukn" else: FailMsg("Could not determine file type of '%s'. " % filepath +"Please go to 'extras/pre-commit' and extend 'GetFileType'. " diff --git a/meld/CMakeLists.txt b/rawmodel/CMakeLists.txt similarity index 100% rename from meld/CMakeLists.txt rename to rawmodel/CMakeLists.txt diff --git a/meld/doc/CMakeLists.txt b/rawmodel/doc/CMakeLists.txt similarity index 100% rename from meld/doc/CMakeLists.txt rename to rawmodel/doc/CMakeLists.txt diff --git a/meld/doc/index.rst b/rawmodel/doc/index.rst similarity index 100% rename from meld/doc/index.rst rename to rawmodel/doc/index.rst diff --git a/meld/pymod/CMakeLists.txt b/rawmodel/pymod/CMakeLists.txt similarity index 100% rename from meld/pymod/CMakeLists.txt rename to rawmodel/pymod/CMakeLists.txt diff --git a/meld/pymod/__init__.py b/rawmodel/pymod/__init__.py similarity index 100% rename from meld/pymod/__init__.py rename to rawmodel/pymod/__init__.py diff --git a/meld/pymod/export_gap.cc b/rawmodel/pymod/export_gap.cc similarity index 100% rename from meld/pymod/export_gap.cc rename to rawmodel/pymod/export_gap.cc diff --git a/meld/pymod/export_model.cc b/rawmodel/pymod/export_model.cc similarity index 100% rename from meld/pymod/export_model.cc rename to rawmodel/pymod/export_model.cc diff --git a/meld/pymod/wrap_meld.cc b/rawmodel/pymod/wrap_meld.cc similarity index 100% rename from meld/pymod/wrap_meld.cc rename to rawmodel/pymod/wrap_meld.cc diff --git a/meld/src/CMakeLists.txt b/rawmodel/src/CMakeLists.txt similarity index 100% rename from meld/src/CMakeLists.txt rename to rawmodel/src/CMakeLists.txt diff --git a/meld/src/gap.cc b/rawmodel/src/gap.cc similarity index 100% rename from meld/src/gap.cc rename to rawmodel/src/gap.cc diff --git a/meld/src/gap.hh b/rawmodel/src/gap.hh similarity index 100% rename from meld/src/gap.hh rename to rawmodel/src/gap.hh diff --git a/meld/src/model.cc b/rawmodel/src/model.cc similarity index 100% rename from meld/src/model.cc rename to rawmodel/src/model.cc diff --git a/meld/src/model.hh b/rawmodel/src/model.hh similarity index 100% rename from meld/src/model.hh rename to rawmodel/src/model.hh diff --git a/meld/tests/CMakeLists.txt b/rawmodel/tests/CMakeLists.txt similarity index 100% rename from meld/tests/CMakeLists.txt rename to rawmodel/tests/CMakeLists.txt diff --git a/meld/tests/data/loop/ext.pdb b/rawmodel/tests/data/loop/ext.pdb similarity index 100% rename from meld/tests/data/loop/ext.pdb rename to rawmodel/tests/data/loop/ext.pdb diff --git a/meld/tests/data/raw-modeling/cbeta.fasta b/rawmodel/tests/data/raw-modeling/cbeta.fasta similarity index 100% rename from meld/tests/data/raw-modeling/cbeta.fasta rename to rawmodel/tests/data/raw-modeling/cbeta.fasta diff --git a/meld/tests/data/raw-modeling/cbeta.pdb b/rawmodel/tests/data/raw-modeling/cbeta.pdb similarity index 100% rename from meld/tests/data/raw-modeling/cbeta.pdb rename to rawmodel/tests/data/raw-modeling/cbeta.pdb diff --git a/meld/tests/data/raw-modeling/compounds.chemlib b/rawmodel/tests/data/raw-modeling/compounds.chemlib similarity index 100% rename from meld/tests/data/raw-modeling/compounds.chemlib rename to rawmodel/tests/data/raw-modeling/compounds.chemlib diff --git a/meld/tests/data/raw-modeling/del.fasta b/rawmodel/tests/data/raw-modeling/del.fasta similarity index 100% rename from meld/tests/data/raw-modeling/del.fasta rename to rawmodel/tests/data/raw-modeling/del.fasta diff --git a/meld/tests/data/raw-modeling/gly.pdb b/rawmodel/tests/data/raw-modeling/gly.pdb similarity index 100% rename from meld/tests/data/raw-modeling/gly.pdb rename to rawmodel/tests/data/raw-modeling/gly.pdb diff --git a/meld/tests/data/raw-modeling/ins.fasta b/rawmodel/tests/data/raw-modeling/ins.fasta similarity index 100% rename from meld/tests/data/raw-modeling/ins.fasta rename to rawmodel/tests/data/raw-modeling/ins.fasta diff --git a/meld/tests/data/raw-modeling/sep.fasta b/rawmodel/tests/data/raw-modeling/sep.fasta similarity index 100% rename from meld/tests/data/raw-modeling/sep.fasta rename to rawmodel/tests/data/raw-modeling/sep.fasta diff --git a/meld/tests/data/raw-modeling/sep.pdb b/rawmodel/tests/data/raw-modeling/sep.pdb similarity index 100% rename from meld/tests/data/raw-modeling/sep.pdb rename to rawmodel/tests/data/raw-modeling/sep.pdb diff --git a/meld/tests/data/raw-modeling/seq.fasta b/rawmodel/tests/data/raw-modeling/seq.fasta similarity index 100% rename from meld/tests/data/raw-modeling/seq.fasta rename to rawmodel/tests/data/raw-modeling/seq.fasta diff --git a/meld/tests/data/raw-modeling/ter.fasta b/rawmodel/tests/data/raw-modeling/ter.fasta similarity index 100% rename from meld/tests/data/raw-modeling/ter.fasta rename to rawmodel/tests/data/raw-modeling/ter.fasta diff --git a/meld/tests/test_gap_extension.py b/rawmodel/tests/test_gap_extension.py similarity index 100% rename from meld/tests/test_gap_extension.py rename to rawmodel/tests/test_gap_extension.py diff --git a/meld/tests/test_raw_modeling.py b/rawmodel/tests/test_raw_modeling.py similarity index 100% rename from meld/tests/test_raw_modeling.py rename to rawmodel/tests/test_raw_modeling.py