| 1 |
jlec 10/02/17 20:59:20 |
| 2 |
|
| 3 |
Added: 2.1.3-parallel.patch 2.1.3-dynamics.patch |
| 4 |
Log: |
| 5 |
Version bump, keyworded for amd64-linux and x86-linux |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/ccpn/files/2.1.3-parallel.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-parallel.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-parallel.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 2.1.3-parallel.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/ccpnmr2.1/c/Makefile b/ccpnmr2.1/c/Makefile |
| 17 |
index 9fa8500..a99a677 100644 |
| 18 |
--- a/ccpnmr2.1/c/Makefile |
| 19 |
+++ b/ccpnmr2.1/c/Makefile |
| 20 |
@@ -2,23 +2,20 @@ include environment.txt |
| 21 |
|
| 22 |
all: compile |
| 23 |
|
| 24 |
-compile: global structure analysis clouds dynamics |
| 25 |
+compile: global structure analysis clouds |
| 26 |
|
| 27 |
global: |
| 28 |
cd memops/global && $(MAKE) |
| 29 |
|
| 30 |
-structure: |
| 31 |
+structure: global |
| 32 |
cd ccp/structure && $(MAKE) |
| 33 |
|
| 34 |
-analysis: |
| 35 |
+analysis: global |
| 36 |
cd ccpnmr/analysis && $(MAKE) |
| 37 |
|
| 38 |
-clouds: |
| 39 |
+clouds: global |
| 40 |
cd ccpnmr/clouds && $(MAKE) |
| 41 |
|
| 42 |
-dynamics: |
| 43 |
- cd ccpnmr/dynamics && $(MAKE) |
| 44 |
- |
| 45 |
clean: global_clean structure_clean analysis_clean clouds_clean dynamics_clean |
| 46 |
|
| 47 |
global_clean: |
| 48 |
@@ -33,9 +30,6 @@ analysis_clean: |
| 49 |
clouds_clean: |
| 50 |
cd ccpnmr/clouds && $(MAKE) clean |
| 51 |
|
| 52 |
-dynamics_clean: |
| 53 |
- cd ccpnmr/dynamics && $(MAKE) clean |
| 54 |
- |
| 55 |
realclean: global_realclean structure_realclean analysis_realclean clouds_realclean dynamics_realclean |
| 56 |
|
| 57 |
global_realclean: |
| 58 |
@@ -50,9 +44,6 @@ analysis_realclean: |
| 59 |
clouds_realclean: |
| 60 |
cd ccpnmr/clouds && $(MAKE) realclean |
| 61 |
|
| 62 |
-dynamics_realclean: |
| 63 |
- cd ccpnmr/dynamics && $(MAKE) realclean |
| 64 |
- |
| 65 |
links: memops_links ccp_links ccpnmr_links |
| 66 |
|
| 67 |
memops_links: |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 sci-chemistry/ccpn/files/2.1.3-dynamics.patch |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-dynamics.patch?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-dynamics.patch?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: 2.1.3-dynamics.patch |
| 77 |
=================================================================== |
| 78 |
diff --git a/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs b/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs |
| 79 |
index 8f56168..093bbe8 100755 |
| 80 |
--- a/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs |
| 81 |
+++ b/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs |
| 82 |
@@ -5,7 +5,6 @@ ln -s ../../../c/ccpnmr/analysis/ContourFile.so ContourFile.so |
| 83 |
ln -s ../../../c/ccpnmr/analysis/ContourLevels.so ContourLevels.so |
| 84 |
ln -s ../../../c/ccpnmr/analysis/ContourStyle.so ContourStyle.so |
| 85 |
ln -s ../../../c/ccpnmr/analysis/PeakCluster.so PeakCluster.so |
| 86 |
-ln -s ../../../c/ccpnmr/analysis/PeakClusterList.so PeakClusterList.so |
| 87 |
ln -s ../../../c/ccpnmr/analysis/PeakList.so PeakList.so |
| 88 |
ln -s ../../../c/ccpnmr/analysis/SliceFile.so SliceFile.so |
| 89 |
ln -s ../../../c/ccpnmr/analysis/WinPeakList.so WinPeakList.so |
| 90 |
@@ -18,9 +17,3 @@ ln -s ../../../c/ccpnmr/clouds/DistForce.so . |
| 91 |
ln -s ../../../c/ccpnmr/clouds/Dynamics.so . |
| 92 |
ln -s ../../../c/ccpnmr/clouds/Midge.so . |
| 93 |
ln -s ../../../c/ccpnmr/clouds/Bacus.so . |
| 94 |
-ln -s ../../../c/ccpnmr/dynamics/DyAtomCoord.so . |
| 95 |
-ln -s ../../../c/ccpnmr/dynamics/DyAtomCoordList.so . |
| 96 |
-ln -s ../../../c/ccpnmr/dynamics/DyDistConstraint.so . |
| 97 |
-ln -s ../../../c/ccpnmr/dynamics/DyDistConstraintList.so . |
| 98 |
-ln -s ../../../c/ccpnmr/dynamics/DyDistForce.so . |
| 99 |
-ln -s ../../../c/ccpnmr/dynamics/DyDynamics.so . |
Archives