moving project meta and packages search to pyproject.toml

schrodinger · May 30, 2024 · fccc77f · fccc77f
1 parent fbfda4a
commit fccc77f
Show file tree

Hide file tree

Showing 17 changed files with 502 additions and 715 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/INSTALL b/INSTALL
@@ -8,7 +8,7 @@ See also: http://pymolwiki.org/index.php/Linux_Install
 REQUIREMENTS
 
     - C++17 compiler (e.g. gcc 8+)
-    - CMake (3.13+)
+    - CMake (3.15+)
     - Python 3.9+
     - Pmw (Python Megawidgets) (optional, for legacy GUI/plugins)
       https://github.com/schrodinger/pmw-patched

diff --git a/contrib/champ/meson.build b/contrib/champ/meson.build
@@ -0,0 +1,26 @@
+files_names = [
+      'champ.c',
+      'champ_module.c',
+      'chiral.c',
+      'err2.c',
+      'feedback2.c',
+      'list.c',
+      'os_memory.c',
+      'sort.c',
+      'strblock.c',
+      'vla.c',
+]
+champ_src_files = []
+
+foreach file_name : files_names
+  champ_src_files += files(file_name)
+endforeach
+
+py = import('python').find_installation(pure: false)
+
+py.extension_module(
+  'chempy.champ._champ',
+  champ_src_files,
+  install: true,
+)
+
diff --git a/create_shadertext.py b/create_shadertext.py
@@ -8,16 +8,18 @@
 from os.path import dirname
 from subprocess import Popen, PIPE
 
-def create_all(generated_dir, pymoldir="."):
+def create_all(pymoldir="."):
     '''
     Generate various stuff
     '''
+    generated_dir = os.path.join(os.environ.get("PYMOL_BLD", "build"), "generated")
     create_shadertext(
             os.path.join(pymoldir, "data", "shaders"),
             generated_dir,
             os.path.join(generated_dir, "ShaderText.h"),
             os.path.join(generated_dir, "ShaderText.cpp"))
     create_buildinfo(generated_dir, pymoldir)
+    print(generated_dir)
 
 class openw(object):
     """
@@ -129,6 +131,7 @@ def create_buildinfo(outputdir, pymoldir='.'):
 #define _PYMOL_BUILD_GIT_SHA "%s"
         ''' % (time.time(), sha), file=out)
 
+create_all()
 if __name__ == "__main__":
     create_shadertext(*sys.argv[1:6])
     create_buildinfo(dirname(sys.argv[4]), dirname(dirname(sys.argv[1])))
diff --git a/layer0/meson.build b/layer0/meson.build
@@ -0,0 +1,44 @@
+files_names = [
+  'Bezier.cpp',
+  'Block.cpp',
+  'CarveHelper.cpp',
+  'ccealignmodule.cpp',
+  'ContourSurf.cpp',
+  'Crystal.cpp',
+  'Err.cpp',
+  'Feedback.cpp',
+  'Field.cpp',
+  'File.cpp',
+  'GenericBuffer.cpp',
+  'GFXManager.cpp',
+  'GraphicsUtil.cpp',
+  'Isosurf.cpp',
+  'Map.cpp',
+  'marching_cubes.cpp',
+  'Match.cpp',
+  'Matrix.cpp',
+  'MemoryDebug.cpp',
+  'MemoryUsage.cpp',
+  'MyPNG.cpp',
+  'os_gl.cpp',
+  'Parse.cpp',
+  'Pixmap.cpp',
+  'PostProcess.cpp',
+  'ShaderMgr.cpp',
+  'ShaderPreprocessor.cpp',
+  'ShaderPrg.cpp',
+  'Sphere.cpp',
+  'Tetsurf.cpp',
+  'Texture.cpp',
+  'Tracker.cpp',
+  'Triangle.cpp',
+  'TTT.cpp',
+  'Util.cpp',
+  'Util2.cpp',
+  'Vector.cpp',
+  'Word.cpp',
+] 
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
diff --git a/layer1/meson.build b/layer1/meson.build
@@ -0,0 +1,53 @@
+files_names = [
+    'Basis.cpp',
+    'ButMode.cpp',
+    'Camera.cpp',
+    'CGO.cpp',
+    'CGOGL.cpp',
+    'CGORenderer.cpp',
+    'Character.cpp',
+    'COLLADA.cpp',
+    'Color.cpp',
+    'Control.cpp',
+    'Extrude.cpp',
+    'Font.cpp',
+    'FontGLUT.cpp',
+    'FontGLUT8x13.cpp',
+    'FontGLUT9x15.cpp',
+    'FontGLUTHel10.cpp',
+    'FontGLUTHel12.cpp',
+    'FontGLUTHel18.cpp',
+    'FontType.cpp',
+    'Movie.cpp',
+    'Ortho.cpp',
+    'P.cpp',
+    'PConv.cpp',
+    'Picking.cpp',
+    'Pop.cpp',
+    'PyMOLObject.cpp',
+    'Ray.cpp',
+    'Rep.cpp',
+    'Scene.cpp',
+    'SceneMouse.cpp',
+    'ScenePicking.cpp',
+    'SceneRay.cpp',
+    'SceneRender.cpp',
+    'SceneView.cpp',
+    'ScrollBar.cpp',
+    'Seq.cpp',
+    'Setting.cpp',
+    'Shaker.cpp',
+    'Symmetry.cpp',
+    'SymOp.cpp',
+    'SymOpPConv.cpp',
+    'SymOpTools.cpp',
+    'Text.cpp',
+    'TypeFace.cpp',
+    'View.cpp',
+    'Wizard.cpp',
+]
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
+
diff --git a/layer2/meson.build b/layer2/meson.build
@@ -0,0 +1,60 @@
+files_names = [
+    'AssemblyHelpers.cpp',
+    'AtomInfo.cpp',
+    'AtomInfoHistory.cpp',
+    'BondTypeHistory.cpp',
+    'CifFile.cpp',
+    'CifMoleculeReader.cpp',
+    'CoordSet.cpp',
+    'DistSet.cpp',
+    'GadgetSet.cpp',
+    'HydrogenAdder.cpp',
+    'MmodTyping.cpp',
+    'MmtfMoleculeReader.cpp',
+    'Mol2Typing.cpp',
+    'MolV3000.cpp',
+    'ObjectAlignment.cpp',
+    'ObjectCallback.cpp',
+    'ObjectCGO.cpp',
+    'ObjectCurve.cpp',
+    'ObjectDist.cpp',
+    'ObjectGadget.cpp',
+    'ObjectGadgetRamp.cpp',
+    'ObjectGroup.cpp',
+    'ObjectMap.cpp',
+    'ObjectMesh.cpp',
+    'ObjectMolecule.cpp',
+    'ObjectMolecule2.cpp',
+    'ObjectMolecule3.cpp',
+    'ObjectSlice.cpp',
+    'ObjectSurface.cpp',
+    'ObjectVolume.cpp',
+    'RepAngle.cpp',
+    'RepCartoon.cpp',
+    'RepCylBond.cpp',
+    'RepDihedral.cpp',
+    'RepDistDash.cpp',
+    'RepDistLabel.cpp',
+    'RepDot.cpp',
+    'RepEllipsoid.cpp',
+    'RepLabel.cpp',
+    'RepMesh.cpp',
+    'RepNonbonded.cpp',
+    'RepNonbondedSphere.cpp',
+    'RepRibbon.cpp',
+    'RepSphere.cpp',
+    'RepSphereGenerate.cpp',
+    'RepSphereImmediate.cpp',
+    'RepSurface.cpp',
+    'RepWireBond.cpp',
+    'Sculpt.cpp',
+    'SculptCache.cpp',
+    'SideChainHelper.cpp',
+    'VFont.cpp',
+]
+
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
+
diff --git a/layer3/meson.build b/layer3/meson.build
@@ -0,0 +1,24 @@
+files_names = [
+    'AtomIterators.cpp',
+    'CifDataValueFormatter.cpp',
+    'Editor.cpp',
+    'Executive.cpp',
+    'ExecutivePython.cpp',
+    'Interactions.cpp',
+    'MaeExportHelpers.cpp',
+    'MoleculeExporter.cpp',
+    'MovieScene.cpp',
+    'PlugIOManager.cpp',
+    'RingFinder.cpp',
+    'Seeker.cpp',
+    'Selector.cpp',
+    'SelectorTmp.cpp',
+    'SpecRec.cpp',
+    'SpecRecSpecial.cpp',
+]
+
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
+
diff --git a/layer4/meson.build b/layer4/meson.build
@@ -0,0 +1,10 @@
+files_names = [
+    'Cmd.cpp',
+    'Menu.cpp',
+    'PopUp.cpp',
+]
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
+
diff --git a/layer5/meson.build b/layer5/meson.build
@@ -0,0 +1,9 @@
+files_names = [
+    'main.cpp',
+    'PyMOL.cpp',
+    'TestPyMOL.cpp'
+]
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
diff --git a/layerCTest/meson.build b/layerCTest/meson.build
@@ -0,0 +1,33 @@
+files_names = [
+    'Test.cpp',
+    'Test_Algorithm.cpp',
+    'Test_Bezier.cpp',
+    'Test_cache_ptr.cpp',
+    'Test_CCrystal.cpp',
+    'Test_CifFile.cpp',
+    'Test_Classic_VLA.cpp',
+    'Test_copyable_ptr.cpp',
+    'Test_Event.cpp',
+    'Test_Executive.cpp',
+    'Test_Image.cpp',
+    'Test_List.cpp',
+    'Test_Picking.cpp',
+    'Test_Result.cpp',
+    'Test_ScrollBar.cpp',
+    'Test_ShaderPreprocessor.cpp',
+    'Test_SymOp.cpp',
+    'Test_Test.cpp',
+    'Test_TTT.cpp',
+    'Test_type_traits.cpp',
+    'Test_Util.cpp',
+    'Test_VLA.cpp',
+    'Test_zstring_view.cpp',
+]
+
+
+foreach file_name : files_names
+  src_files += files(file_name)
+endforeach
+
+macros += '-D_PYMOL_CTEST'
+