From f0c8a766bce75f81a74873f54ac151245d4d07c4 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Wed, 30 Oct 2019 17:11:03 -0500 Subject: [PATCH 1/3] Reverted commit ef56405411df6d032a7a9d313a9cab8f5425e0f1 --- configure/RELEASE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 41f1652a..55ed4019 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -44,6 +44,6 @@ IPAC=$(SUPPORT)/ipac-R2-15 # These lines allow developers to override these RELEASE settings # without having to modify this file directly. --include $(or $(MOTOR),$(TOP))/../RELEASE.local --include $(or $(MOTOR),$(TOP))/../RELEASE.$(EPICS_HOST_ARCH).local --include $(or $(MOTOR),$(TOP))/configure/RELEASE.local +-include $(TOP)/../RELEASE.local +-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local +-include $(TOP)/configure/RELEASE.local From a8e87030c346b404d6aa39169cf94c9e83bfcc83 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Wed, 30 Oct 2019 17:12:23 -0500 Subject: [PATCH 2/3] Initialize SUPPORT and EPICS_BASE --- configure/RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 55ed4019..3fdf3793 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -9,7 +9,7 @@ # # Add your declarations here -SUPPORT= +SUPPORT=/path/to/support # If any motor controller communication mechanism besides # the VME backplane is required, then ASYN must be defined. @@ -23,7 +23,7 @@ SNCSEQ=$(SUPPORT)/seq-2-2-6 BUSY=$(SUPPORT)/busy-R1-7-1 # Recommended EPICS release: R3.15.6 -EPICS_BASE= +EPICS_BASE=/path/to/base # The following must be defined for motorMXmotor #!MX=$(SUPPORT)/mx/mx From 31957848dc8cd9d73b930854575a240a77b3c1e5 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Wed, 30 Oct 2019 18:02:26 -0500 Subject: [PATCH 3/3] Updated the driver modules to include the change to EXAMPLE_RELEASE.local that allows them to be built outside of the motor module after commit f0c8a766bce75f81a74873f54ac151245d4d07c4 --- modules/motorAMCI | 2 +- modules/motorAcs | 2 +- modules/motorAcsTech80 | 2 +- modules/motorAerotech | 2 +- modules/motorAttocube | 2 +- modules/motorDeltaTau | 2 +- modules/motorFaulhaber | 2 +- modules/motorHytec | 2 +- modules/motorIms | 2 +- modules/motorKohzu | 2 +- modules/motorMXmotor | 2 +- modules/motorMclennan | 2 +- modules/motorMicos | 2 +- modules/motorMicroMo | 2 +- modules/motorMicronix | 2 +- modules/motorMotorSim | 2 +- modules/motorNPoint | 2 +- modules/motorNewFocus | 2 +- modules/motorNewport | 2 +- modules/motorOms | 2 +- modules/motorOmsAsyn | 2 +- modules/motorOriel | 2 +- modules/motorPI | 2 +- modules/motorPIGCS2 | 2 +- modules/motorParker | 2 +- modules/motorPhytron | 2 +- modules/motorPiJena | 2 +- modules/motorScriptMotor | 2 +- modules/motorSmarAct | 2 +- modules/motorSmartMotor | 2 +- modules/motorThorLabs | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/motorAMCI b/modules/motorAMCI index cfd32e40..53b22b30 160000 --- a/modules/motorAMCI +++ b/modules/motorAMCI @@ -1 +1 @@ -Subproject commit cfd32e400cf9033219b514e0e874f5fa8c1ab31f +Subproject commit 53b22b302ea43733bd713110b6ecdf1d83b60436 diff --git a/modules/motorAcs b/modules/motorAcs index ba3193b3..ebbb747a 160000 --- a/modules/motorAcs +++ b/modules/motorAcs @@ -1 +1 @@ -Subproject commit ba3193b340085a016ecc12e57e0a78736d20955a +Subproject commit ebbb747a721e4393826fc15413d3c2674e50f13f diff --git a/modules/motorAcsTech80 b/modules/motorAcsTech80 index f409282b..9fe15a28 160000 --- a/modules/motorAcsTech80 +++ b/modules/motorAcsTech80 @@ -1 +1 @@ -Subproject commit f409282bba942564d891e83a46e486940e3e353e +Subproject commit 9fe15a2860d09448c588e8f0fdfeb80280546d39 diff --git a/modules/motorAerotech b/modules/motorAerotech index 1b8e4c00..9abae642 160000 --- a/modules/motorAerotech +++ b/modules/motorAerotech @@ -1 +1 @@ -Subproject commit 1b8e4c00235b02ce904f30c0cf0e16b7ac55b2ce +Subproject commit 9abae6420d0e7df2a7369105f577cc5f783e3a6b diff --git a/modules/motorAttocube b/modules/motorAttocube index 8f1a9aa4..331069c6 160000 --- a/modules/motorAttocube +++ b/modules/motorAttocube @@ -1 +1 @@ -Subproject commit 8f1a9aa444bb9a58b3bf0105272105f545b83c60 +Subproject commit 331069c605e03cd78c438d53c1d8decb714f4d83 diff --git a/modules/motorDeltaTau b/modules/motorDeltaTau index 9b49dd5f..ab27eae3 160000 --- a/modules/motorDeltaTau +++ b/modules/motorDeltaTau @@ -1 +1 @@ -Subproject commit 9b49dd5f232acae3af1faa2e6d3259c9faf57d8f +Subproject commit ab27eae3eb3f81b81ec23204448189bac9440ddf diff --git a/modules/motorFaulhaber b/modules/motorFaulhaber index e028325b..62ae8c9d 160000 --- a/modules/motorFaulhaber +++ b/modules/motorFaulhaber @@ -1 +1 @@ -Subproject commit e028325b50901c9da01955a84541ace0768a6882 +Subproject commit 62ae8c9d46dfc0126aeb8e6bd480a5f13704ec6e diff --git a/modules/motorHytec b/modules/motorHytec index 7872aebc..b82e4a4b 160000 --- a/modules/motorHytec +++ b/modules/motorHytec @@ -1 +1 @@ -Subproject commit 7872aebc0f026efca7839e61410bc0a546922a8c +Subproject commit b82e4a4bee64ac7b78f9affd9a15ffb0a2794f1e diff --git a/modules/motorIms b/modules/motorIms index 10c502c8..95ead313 160000 --- a/modules/motorIms +++ b/modules/motorIms @@ -1 +1 @@ -Subproject commit 10c502c8dc118591f63cc4c9cdc41127883ff1f5 +Subproject commit 95ead31379acbd03e729eb5124a278f292e7395c diff --git a/modules/motorKohzu b/modules/motorKohzu index d4f694d5..ac826027 160000 --- a/modules/motorKohzu +++ b/modules/motorKohzu @@ -1 +1 @@ -Subproject commit d4f694d586a43c6c664c70e48ee54a30e38f0bef +Subproject commit ac8260270648223e4617f8bb30f91448abf9f4ee diff --git a/modules/motorMXmotor b/modules/motorMXmotor index 5fa12214..f58865ae 160000 --- a/modules/motorMXmotor +++ b/modules/motorMXmotor @@ -1 +1 @@ -Subproject commit 5fa12214260d0c13a297340f8f4be109c4005b69 +Subproject commit f58865ae748bb30114a60fd36148788473e24031 diff --git a/modules/motorMclennan b/modules/motorMclennan index f4f17084..8a84e307 160000 --- a/modules/motorMclennan +++ b/modules/motorMclennan @@ -1 +1 @@ -Subproject commit f4f170849731d0c5ef84a05315a1dcffe802b881 +Subproject commit 8a84e307b9bc2cb608a223bf9a3187934ed475d8 diff --git a/modules/motorMicos b/modules/motorMicos index e92135f3..6049202c 160000 --- a/modules/motorMicos +++ b/modules/motorMicos @@ -1 +1 @@ -Subproject commit e92135f37c5367b12a9d762e409fb86f3555fd5b +Subproject commit 6049202cd3a0f8c9f0450f179baeb3e9503785df diff --git a/modules/motorMicroMo b/modules/motorMicroMo index 04331b5c..c1b16db9 160000 --- a/modules/motorMicroMo +++ b/modules/motorMicroMo @@ -1 +1 @@ -Subproject commit 04331b5cfa223a530591a6f2273b414531d8d151 +Subproject commit c1b16db9a8af59b85ce1253f7482a880b1b92103 diff --git a/modules/motorMicronix b/modules/motorMicronix index 59a7f06f..1afcc7e3 160000 --- a/modules/motorMicronix +++ b/modules/motorMicronix @@ -1 +1 @@ -Subproject commit 59a7f06fbf4c70dd5af439f6bec6d45fe4c4335a +Subproject commit 1afcc7e36aed0bb87044eff988d343b736a36d6c diff --git a/modules/motorMotorSim b/modules/motorMotorSim index 20bd29c8..ed21eac0 160000 --- a/modules/motorMotorSim +++ b/modules/motorMotorSim @@ -1 +1 @@ -Subproject commit 20bd29c8eaee6ccd236fec1d542472e0e5dc643f +Subproject commit ed21eac09615ec5bb8bde44a13df28cd651b0f35 diff --git a/modules/motorNPoint b/modules/motorNPoint index 4d2f2974..f935b02b 160000 --- a/modules/motorNPoint +++ b/modules/motorNPoint @@ -1 +1 @@ -Subproject commit 4d2f297414e62eceb267541a975694dbad1374b5 +Subproject commit f935b02bd55ebc255daa1df9407dbd6cd0b6cd40 diff --git a/modules/motorNewFocus b/modules/motorNewFocus index 9b5dc615..0000255a 160000 --- a/modules/motorNewFocus +++ b/modules/motorNewFocus @@ -1 +1 @@ -Subproject commit 9b5dc61554a2748db776ad71cda5b1acdf712084 +Subproject commit 0000255ab0a98ba2f57c4b485cddc661500815fc diff --git a/modules/motorNewport b/modules/motorNewport index 6201b857..4cf6214b 160000 --- a/modules/motorNewport +++ b/modules/motorNewport @@ -1 +1 @@ -Subproject commit 6201b85711edb3437343487f3dcd96149473cbba +Subproject commit 4cf6214bffc74f0784a2b141a1453f8fb01a05c8 diff --git a/modules/motorOms b/modules/motorOms index ee078b39..53030c9f 160000 --- a/modules/motorOms +++ b/modules/motorOms @@ -1 +1 @@ -Subproject commit ee078b399c77135f88cbd672da72bc2ae9e0669e +Subproject commit 53030c9fce285196d1d7aac75b61682f597a3a09 diff --git a/modules/motorOmsAsyn b/modules/motorOmsAsyn index e949e2c5..4fdd003b 160000 --- a/modules/motorOmsAsyn +++ b/modules/motorOmsAsyn @@ -1 +1 @@ -Subproject commit e949e2c51c0766a878dd7f1c322d1144305f06fe +Subproject commit 4fdd003bcede7728327026525ad633beab6cfcaf diff --git a/modules/motorOriel b/modules/motorOriel index e325636d..9f85ecde 160000 --- a/modules/motorOriel +++ b/modules/motorOriel @@ -1 +1 @@ -Subproject commit e325636dbb06ed5c425fdc81a84bbd7b4ce00740 +Subproject commit 9f85ecde56ce9e8758efba1e0175ef498c4bcaa7 diff --git a/modules/motorPI b/modules/motorPI index 3e8d6cc3..045f6cf2 160000 --- a/modules/motorPI +++ b/modules/motorPI @@ -1 +1 @@ -Subproject commit 3e8d6cc3fca4c38abdbc6404b2f772adc1bafbaf +Subproject commit 045f6cf2b339f7a947efb7e84dc375dac5e36f50 diff --git a/modules/motorPIGCS2 b/modules/motorPIGCS2 index 59b31e0c..98d36131 160000 --- a/modules/motorPIGCS2 +++ b/modules/motorPIGCS2 @@ -1 +1 @@ -Subproject commit 59b31e0cec8eb0db037b13f1f2936d0fcd5ae059 +Subproject commit 98d36131b2d57ebc1cd29bb344df21bf4f0d932a diff --git a/modules/motorParker b/modules/motorParker index efe069c2..03ef9ca8 160000 --- a/modules/motorParker +++ b/modules/motorParker @@ -1 +1 @@ -Subproject commit efe069c2c2bfaed292a6b687290e789df114d88d +Subproject commit 03ef9ca874ad61747e7efafe08527e378608f216 diff --git a/modules/motorPhytron b/modules/motorPhytron index 4c214041..72281de8 160000 --- a/modules/motorPhytron +++ b/modules/motorPhytron @@ -1 +1 @@ -Subproject commit 4c2140414e54d0565b5afd43b2be1ca3bf7b3601 +Subproject commit 72281de83391d838f3d0709cb0205a4fa055c426 diff --git a/modules/motorPiJena b/modules/motorPiJena index 1dd01ea9..733d9b0e 160000 --- a/modules/motorPiJena +++ b/modules/motorPiJena @@ -1 +1 @@ -Subproject commit 1dd01ea908e0baac3e6e2929595fb7da4f6d40b2 +Subproject commit 733d9b0e6beba9e891487bf81fe05d5fd367c490 diff --git a/modules/motorScriptMotor b/modules/motorScriptMotor index 495b57a6..5517d7de 160000 --- a/modules/motorScriptMotor +++ b/modules/motorScriptMotor @@ -1 +1 @@ -Subproject commit 495b57a61c196c1440c7ae6b228984d5e6e9ee76 +Subproject commit 5517d7deaf04bab1a6057c64a82cd00381ce480e diff --git a/modules/motorSmarAct b/modules/motorSmarAct index 66015236..22a1fbe9 160000 --- a/modules/motorSmarAct +++ b/modules/motorSmarAct @@ -1 +1 @@ -Subproject commit 66015236bd1bf44176bf6dc5cdb99761b43dee31 +Subproject commit 22a1fbe9043879330568ae8695d1f10a695fe336 diff --git a/modules/motorSmartMotor b/modules/motorSmartMotor index 23eb223b..8a1b9cb9 160000 --- a/modules/motorSmartMotor +++ b/modules/motorSmartMotor @@ -1 +1 @@ -Subproject commit 23eb223b1dd36ca4a79734d678fc3d9f36e1f214 +Subproject commit 8a1b9cb9e30ffd65fc0db6d0aa79db530d6c3da6 diff --git a/modules/motorThorLabs b/modules/motorThorLabs index 11365b26..9ec46c1b 160000 --- a/modules/motorThorLabs +++ b/modules/motorThorLabs @@ -1 +1 @@ -Subproject commit 11365b26a6a63d474dc3e95b53e1213bfa01b6a2 +Subproject commit 9ec46c1b328227e3405730bb20f869c8a639cc8e