Skip to content

Commit d0572d9

Browse files
timjtimj
committed
pal: PAL is now a submodule
I've been asked to make it easier to access PAL so I've put it up as a standalone repository and now link to it as a submodule. I've moved it to libext to prevent strange submodule naming clashes in libraries/pal if we change from real to submodule.
1 parent 9003090 commit d0572d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+57
-20970
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,6 @@
151151
[submodule "thirdparty/perlsys/perlmods/perl-JCMT-DAS"]
152152
path = thirdparty/perlsys/perlmods/perl-JCMT-DAS
153153
url = git://github.com/jac-h/perl-JCMT-DAS.git
154+
[submodule "libext/pal"]
155+
path = libext/pal
156+
url = ../pal

‎Makefile.dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@ $(MANIFESTS)/pal: \
18201820
$(MANIFESTS)/sofa \
18211821
$(MANIFESTS)/star2html \
18221822
$(MANIFESTS)/starutil
1823-
cd libraries/pal \
1823+
cd libext/pal \
18241824
&& $(MAKE_CPT)
18251825

18261826
$(MANIFESTS)/pamela: \

‎componentset.xml

+25-25
Original file line numberDiff line numberDiff line change
@@ -4788,6 +4788,31 @@ to handle data from a variety of different instruments.
47884788
<bugreports>[email protected]</bugreports>
47894789
</component>
47904790

4791+
<component id="pal" support="S">
4792+
<version>0.1.5</version>
4793+
<path>libext/pal</path>
4794+
<description>Position Astronomy Library</description>
4795+
<abstract><p>
4796+
This library is a collection of code designed to aid in
4797+
replacing the SLA library with code from NOVAS and
4798+
SOFA.
4799+
4800+
Where possible the API is similar to the C SLA API
4801+
except for the use of a "pal" prefix.
4802+
</p></abstract>
4803+
<dependencies >
4804+
<build>sofa</build><build>starutil</build><link>sofa</link><link>starutil</link><sourceset>star2html</sourceset>
4805+
</dependencies>
4806+
<developers>
4807+
<person>
4808+
<name>Tim Jenness</name>
4809+
<uname>[email protected]</uname>
4810+
</person>
4811+
</developers>
4812+
<documentation> sun267</documentation>
4813+
<bugreports>[email protected]</bugreports>
4814+
</component>
4815+
47914816
<component id="agi" support="S">
47924817
<version>2.1-2</version>
47934818
<path>libraries/agi</path>
@@ -5784,31 +5809,6 @@ Ultrix and for SunOS and may still work for them.
57845809
<bugreports>[email protected]</bugreports>
57855810
</component>
57865811

5787-
<component id="pal" support="S">
5788-
<version>0.1.5</version>
5789-
<path>libraries/pal</path>
5790-
<description>Position Astronomy Library</description>
5791-
<abstract><p>
5792-
This library is a collection of code designed to aid in
5793-
replacing the SLA library with code from NOVAS and
5794-
SOFA.
5795-
5796-
Where possible the API is similar to the C SLA API
5797-
except for the use of a "pal" prefix.
5798-
</p></abstract>
5799-
<dependencies >
5800-
<build>sofa</build><build>starutil</build><link>sofa</link><link>starutil</link><sourceset>star2html</sourceset>
5801-
</dependencies>
5802-
<developers>
5803-
<person>
5804-
<name>Tim Jenness</name>
5805-
<uname>[email protected]</uname>
5806-
</person>
5807-
</developers>
5808-
<documentation> sun267</documentation>
5809-
<bugreports>[email protected]</bugreports>
5810-
</component>
5811-
58125812
<component id="par" support="S">
58135813
<version>2.3-2</version>
58145814
<path>libraries/par</path>

‎configure.ac.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dnl include buildsupport here, then ./configure will recurse into
4646
dnl buildsupport/starconf, which means we end up reconfiguring it
4747
dnl with a wrong --prefix whenever we ./configure in the top-level
4848
dnl directory.
49-
AC_CONFIG_SUBDIRS(applications libraries etc thirdparty docs)
49+
AC_CONFIG_SUBDIRS(applications libext libraries etc thirdparty docs)
5050

5151
AC_CONFIG_FILES(Makefile)
5252
AC_OUTPUT

‎libext/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Process this file with automake to produce Makefile.in
2+
3+
SUBDIRS = @subdirs@

‎libext/README

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This directory contains libraries that are a core part of the Starlink distribution
2+
but which are distributed in separate source code repositories.

‎libext/configure.ac

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
dnl Process this file with autoconf to produce a configure script
2+
3+
dnl This is not a package, so the first two arguments are fake.
4+
AC_INIT(star-libext, 1.0, [email protected])
5+
AM_INIT_AUTOMAKE(1.8.2-starlink)
6+
7+
dnl Following sanity-check isn't terribly helpful...
8+
AC_CONFIG_SRCDIR(bootstrap)
9+
STAR_DEFAULTS
10+
11+
AC_PROG_MAKE_SET
12+
13+
dnl The following list must be kept up-to-date by hand.
14+
dnl The list is available as the substitution variable @subdirs@.
15+
dnl (must be kept on one line)
16+
AC_CONFIG_SUBDIRS(pal)
17+
18+
AC_CONFIG_FILES(Makefile)
19+
20+
AC_OUTPUT

‎libext/pal

Submodule pal added at e7285fb

‎libraries/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AC_PROG_MAKE_SET
1313
dnl The following list must be kept up-to-date by hand.
1414
dnl The list is available as the substitution variable @subdirs@.
1515
dnl (must be kept on one line)
16-
AC_CONFIG_SUBDIRS(agi ard ary ast atl cat chr cnf ctg ems fio gks gns graphpar grp gsd gwm hds hlp idi img irq kaplibs lpg mers nbs ndf ndg one pal par pcs pda pgp prm psx ref sae sgs shl sla snx starmem starutil thr trn)
16+
AC_CONFIG_SUBDIRS(agi ard ary ast atl cat chr cnf ctg ems fio gks gns graphpar grp gsd gwm hds hlp idi img irq kaplibs lpg mers nbs ndf ndg one par pcs pda pgp prm psx ref sae sgs shl sla snx starmem starutil thr trn)
1717

1818
AC_CONFIG_FILES(Makefile)
1919

0 commit comments

Comments
 (0)