Ville Suoranta | 7a874a691abM | Pull request #37: CAS-13923Merge in CASA/casaviewer from CAS-13923 to master
* commit '8913655111c28f25902323faca7d3432f7894c1f':
fix python package build [CAS-13923]
update casa-source [CAS-13923]
build with system grpc (and/or without casatools, at build time) [CAS-13923]5 tags | | CAS-13923 |
Darrell Schiebel | 8913655111cfix python package build [CAS-13923] | fix python package build [CAS-13923]CAS-13923-3 | | CAS-13923 |
Darrell Schiebel | 036c6b8c280 | update casa-source [CAS-13923]CAS-13923-2 | | CAS-13923 |
Darrell Schiebel | 27a8e3adb1c | build with system grpc (and/or without casatools, at build time) [CAS-13923]CAS-13923-1 | | CAS-13923 |
C. Enrique Garcia Dabo | f0e97b934b3M | Pull request #36: CAS-13867: Clean up of #ifdef conditional compilationsMerge in CASA/casaviewer from CAS-13867 to master
* commit 'cf5b8d5ee281205f744618a0928052b6281901de':
Fix typo.
Move casa-source pointer forward to CAS-13867 tip3 tags | | CAS-13867 |
C. Enrique Garcia Dabo | cf5b8d5ee28 | Fix typo.Fixes partially CAS-13867CAS-13867-8 | | CAS-13867 |
C. Enrique Garcia Dabo | 472763607ed | Move casa-source pointer forward to CAS-13867 tipCAS-13867-7 | | CAS-13867 |
C. Enrique Garcia Dabo | 76095c2d024M | Pull request #35: CAS-13867: Clean up of #ifdef conditional compilationsMerge in CASA/casaviewer from CAS-13867 to master
* commit '467fc921416196fa642778cec0e5c29accdacb78':
Do not use CASATOOLS ifdef but rather USE_GRPC where appropiate.
Do not define CASATOOLS. Define USE_GRPC where needed.
Advance casa-source pointer for CAS-13867
Update to the latest casa-source pointer from branch CAS-138671.6.5 | | CAS-13867 |
C. Enrique Garcia Dabo | 467fc921416 | Do not use CASATOOLS ifdef but rather USE_GRPC where appropiate.Fixies partially CAS-13867CAS-13867-6 | | CAS-13867 |
C. Enrique Garcia Dabo | c8d79b4dd35M | Merge remote-tracking branch 'origin/master' into CAS-13867CAS-13867-5 | | CAS-13867 |
C. Enrique Garcia Dabo | 1cdb1274e49 | Do not define CASATOOLS. Define USE_GRPC where needed.Fixes partially CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | eba2e319ce2M | Pull request #34: CAS-13859 Break circular dependency of casacpp modulesMerge in CASA/casaviewer from CAS-13859 to master
* commit '4ed1005bcf0d086278e748b919e447568c31e18c':
Follow more recent changes of casa6 as part of CAS-13859
updated casa-source to most recent casa6 CAS-13857 changes
Fix code for casacore changes
Set casa6 branch commit and add X11 dir
Follow changes in repository structure of casa6 as part of CAS-138591.6.4 | | 2 Jira issues |
C. Enrique Garcia Dabo | 4ed1005bcf0M | Merge remote-tracking branch 'origin/master' into CAS-13859CAS-13859-4 | | CAS-13859 |
C. Enrique Garcia Dabo | f6e7bb514bbM | Pull request #33: CAS-13868 Remove obsolete X11 headersMerge in CASA/casaviewer from CAS-13868 to master
* commit 'e3b27b3f287d8330e0e8107819eb26c43bf57542':
Advance casa-source pointer to head of casa6 CAS-13868
Set casa6 branch commit and add X11 dir
Fix code for casacore changes
explicitly set permissions in the app1.6.3 | | CAS-13868 |
C. Enrique Garcia Dabo | e3b27b3f287 | Advance casa-source pointer to head of casa6 CAS-13868CAS-13868-4 | | CAS-13868 |
Pam Harris | fbf27262ffa | Set casa6 branch commit and add X11 dir | | |
Pam Harris | 2c139a0daf0 | Fix code for casacore changes | | |
C. Enrique Garcia Dabo | fd94d78f013M | Merge branch 'master' into CAS-13868 | | CAS-13868 |
C. Enrique Garcia Dabo | 8e26fee32ce | Advance casa-source pointer for CAS-13867CAS-13867-4 | | CAS-13867 |
C. Enrique Garcia Dabo | 8601bb59088M | Merge commit '730e89ded308cd5c4275334cd8762881cede3197' into CAS-13867CAS-13867-3 | | CAS-13867 |
C. Enrique Garcia Dabo | 31cfdc85883 | Follow more recent changes of casa6 as part of CAS-13859CAS-13859-3 | | CAS-13859 |
C. Enrique Garcia Dabo | 24bcac9c7af | Update to the latest casa-source pointer from branch CAS-13867CAS-13867-2 | | CAS-13867 |
Pam Harris | c9c5c31389b | explicitly set permissions in the appCAS-13868-3 | | |
C. Enrique Garcia Dabo | 412b99b5486 | updated casa-source to most recent casa6 CAS-13857 changesCAS-13857-3 | | CAS-13857 |
Pam Harris | 730e89ded30 | Fix code for casacore changes | | |
Pam Harris | 4310b098940 | Set casa6 branch commit and add X11 dir | | |
C. Enrique Garcia Dabo | 659a839dd4c | Follow changes in repository structure of casa6 as part of CAS-13859CAS-13859-2 | | CAS-13859 |
C. Enrique Garcia Dabo | 27e0b752b06 | Revert last three commits which have been unintentially pushed to masterRevert "updated casa-source to most recent casa6 CAS-13857 changes"
Revert "Fix code for casacore changes"
Revert "Set casa6 branch commit and add X11 dir"
This reverts commit debc2a9b01bd0455b85bb484cddb019dd93c69e4.
This reverts commit 88a5009f7ac1d12c0aa466bffc432666b1626653.
This reverts commit 88a5009f7ac1d12c0aa466bffc432666b1626653.2 tags | | CAS-13857 |
C. Enrique Garcia Dabo | debc2a9b01b | updated casa-source to most recent casa6 CAS-13857 changes3 tags | | CAS-13857 |
Pam Harris | 907a4631e74 | Fix code for casacore changesCAS-13868-2 | | |
Pam Harris | 88a5009f7ac | Set casa6 branch commit and add X11 dir | | |
Ville Suoranta | d2a23307f6dM | Merge pull request #31 in CASA/casaviewer from CAS-13707 to master* commit '479ebbe2b3e53ee5ff76f941142ca01a1b394061':
Missed adding this to previous commit
Removed casa5 code, added doc header and renamed test scripts to follow the new naming convention4 tags | | CAS-13707 |
Sandra M Castro | 479ebbe2b3e | Missed adding this to previous commitCAS-13707-2 | | |
Sandra M Castro | 15f64ab17f6 | Removed casa5 code, added doc header and renamed test scripts to follow the new naming convention | | |
Ville Suoranta | 159918b3191M | Merge pull request #30 in CASA/casaviewer from CAS-13727 to master* commit '964cc310f6809865409431a0c3bf0d651efa4be2':
Update casa6 branch commit
Update casa6 branch commit
Update casa6 branch commit for CRTF parser fix3 tags | | CAS-13727 |
Pam Harris | 964cc310f68 | Update casa6 branch commitCAS-13727-4 | | |
Pam Harris | 4d00c0971f6 | Update casa6 branch commitCAS-13727-3 | | |
Pam Harris | 31b4256e75d | Update casa6 branch commit for CRTF parser fixCAS-13727-2 | | |
Ville Suoranta | 68868ad190bM | Merge pull request #29 in CASA/casaviewer from CAS-13461 to master* commit '6a354bd2e2cdbf5e2b682fd0af2a046977013f13':
updated casa-source to point to (hopefully) final CAS-13461 state before PR
Copied some .cc files where the header files were previously copied to CASAviewer (orphaned implementation files not compiled anywhere)
move casaviewer XML files to casaviewer repository (CAS-13461)
updated casa-source to most recent casa6 CAS-13461 changes, r...4 tags | | CAS-13461 |
Bob Garwood | 6a354bd2e2c | updated casa-source to point to (hopefully) final CAS-13461 state before PRCAS-13461-11 | | CAS-13461 |
Bob Garwood | 5551692c04c | Copied some .cc files where the header files were previously copied to CASAviewer (orphaned implementation files not compiled anywhere) | | |
Darrell Schiebel | 26cf04d4951 | move casaviewer XML files to casaviewer repository (CAS-13461)CAS-13461-10 | | CAS-13461 |
Bob Garwood | ac944dcb803 | updated casa-source to most recent casa6 CAS-13461 changes, removed one copied code duplicated in the wrong placeCAS-13461-9 | | CAS-13461 |
Bob Garwood | 9adc7653d2f | casa-source brought up to date with latest merge of master into casa6 for this branchCAS-13461-8 | | |
Bob Garwood | 31b0f8e06d9 | updated casa-source to most recent CAS-13461CAS-13461-7 | | CAS-13461 |
Bob Garwood | 5c65e50a987 | Brought copied casaviewer code up to date with recent changes in casa6 masterCAS-13461-6 | | |
Bob Garwood | 0674ecc4143M | Updated casa-source to latest casa6 CAS-13461 branch | | CAS-13461 |
Darrell Schiebel | 54889d6f036M | Merge pull request #28 in CASA/casaviewer from CAS-13498 to master* commit 'c28b36dbdd5551e0842a621c8bb2856ccede13fa':
update casa6 submodule reference after trunk merge (CAS-13498)
update casa6 submodule reference (CAS-13498)
fix viewer restart on failure (CAS-13498)2 tags | | CAS-13498 |
Darrell Schiebel | c28b36dbdd5M | Merge branch 'master' into CAS-13498CAS-13498-4 | | CAS-13498 |
Darrell Schiebel | 04575533181 | update casa6 submodule reference after trunk merge (CAS-13498)CAS-13498-3 | | CAS-13498 |