Skip to content

Commit c1972c0

Browse files
Updated version number, and other minor changes in license header
1 parent f941cf4 commit c1972c0

10 files changed

+25
-25
lines changed

compare_versions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###########################################################################
44
#
55
# SWIG-generated python wrapper for the Linear Arrangement Library
6-
# Copyright (C) 2021-2023 LAL-project developers
6+
# Copyright (C) 2021 - 2024 LAL-project developers
77
# Lluís Alemany Puig
88
#
99
# This program is free software: you can redistribute it and/or modify

compile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###########################################################################
44
#
55
# SWIG-generated python wrapper for the Linear Arrangement Library
6-
# Copyright (C) 2021-2023 LAL-project developers
6+
# Copyright (C) 2021 - 2024 LAL-project developers
77
# Lluís Alemany Puig
88
#
99
# This program is free software: you can redistribute it and/or modify

instructions/installation-python-interface-macos-sources.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Users need to install the following dependencies.
2020

2121
### LAL
2222

23-
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)).
23+
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)).
2424

2525
### Python3
2626

@@ -59,7 +59,7 @@ In order to compile the interface, you have to configure one of the build files
5959

6060
### Location of LAL
6161

62-
First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the location of LAL's header files and LAL's binary files in [`Makefile.lalsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.lalsource). For example,
62+
First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the location of LAL's header files and LAL's binary files in [`Makefile.lalsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.lalsource). For example,
6363

6464
# ----------------
6565
# MACOS USERS ONLY
@@ -73,7 +73,7 @@ First of all, modify the variables `LAL_INC_DIR` and `LAL_LIB_DIR` with the loca
7373

7474
### Location of Python sources and libraries
7575

76-
Secondly, specify the version of Python against which the interface is linked in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.pythonsource). Indicate where Python's header files are located at, and where to find the binaries. To do this, modify the variables `PYTHON_INC_DIR` and `PYTHON_LIB_DIR`. The default values are the following
76+
Secondly, specify the version of Python against which the interface is linked in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.pythonsource). Indicate where Python's header files are located at, and where to find the binaries. To do this, modify the variables `PYTHON_INC_DIR` and `PYTHON_LIB_DIR`. The default values are the following
7777

7878
# Python 3 include dir
7979
PYTHON_INC_DIR = /usr/include/python3.$(MINOR_VERSION_PYTHON)
@@ -91,7 +91,7 @@ Users who installed *anaconda* may want to change the values for:
9191

9292
### Destination of LAL's python wrapper
9393

94-
Also in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/blob/main/Makefile.pythonsource), users can also choose the destination directory of LAL's python interface by modifing the variable `LAL_PY_DEST`. The default value is
94+
Also in [`Makefile.pythonsource`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile.pythonsource), users can also choose the destination directory of LAL's python interface by modifing the variable `LAL_PY_DEST`. The default value is
9595

9696
# Directory where LAL's interface will be installed to
9797
LAL_PY_DEST = /usr/local/lib/python3.$(MINOR_VERSION_PYTHON)/dist-packages
@@ -103,7 +103,7 @@ Users who wish to install LAL into *anaconda*'s installation directory may want
103103

104104
### Compiler
105105

106-
Last but not least, users must specify which compiler is to be used in [`Makefile`](https://github.com/LAL-project/python-interface/blob/main/Makefile). One requirement is that the compiler used must have support for `C++17`'s standard.
106+
Last but not least, users must specify which compiler is to be used in [`Makefile`](https://github.com/LAL-project/python-interface/tree/24.10/Makefile). One requirement is that the compiler used must have support for `C++17`'s standard.
107107

108108
CXX = /usr/local/Cellar/gcc/11.2.0/bin/g++-11
109109

instructions/installation-python-interface-ubuntu-sources.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ All the instructions below require the use of a command-line terminal. Head over
2424

2525
### LAL
2626

27-
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)) of that project.
27+
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)) of that project.
2828

2929
### Python3
3030

@@ -54,7 +54,7 @@ In order to compile the interface, you have to configure two build scripts (chan
5454
- the location of the python binaries and header development files,
5555
- the location where LAL has been installed in the system.
5656

57-
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/blob/main/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
57+
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/tree/24.10/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
5858

5959
LAL_HEADERS= # directory of the header files of LAL
6060
LAL_LIBRARY= # directory of the binary files of LAL (.so)
@@ -63,7 +63,7 @@ With this information, you will have to edit the [sample script file](https://gi
6363
GMP_LIBRARY= # (?) directory of the binary files of GMP (.so)
6464
PYTHON_HEADERS= # directory of the header (development) files of python
6565

66-
Check the other [two](https://github.com/LAL-project/python-interface/blob/main/run_distribution_ubuntu.sh) [script](https://github.com/LAL-project/python-interface/blob/main/run_install_ubuntu.sh) files to see examples of contents.
66+
Check the other [two](https://github.com/LAL-project/python-interface/tree/24.10/run_distribution_ubuntu.sh) [script](https://github.com/LAL-project/python-interface/tree/24.10/run_install_ubuntu.sh) files to see examples of contents.
6767

6868
## Compiling and installing the interface
6969

instructions/installation-python-interface-windows-sources.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We first describe the basic setup of the system for the compilation of the pytho
66

77
## Necessary tools and basic setup of the system
88

9-
We recommend installing the [`MSYS2`](https://www.msys2.org/) subsystem for simplicity. This can be done following the 7 steps in their webpage. These consist of downloading and executing the installer and executing some very well-explained commands. With a fast internet connection it should take no more than 15 minutes. If you already did it when install [LAL from sources](https://github.com/LAL-project/linear-arrangement-library/blob/master/instructions/installation-library-sources-windows.md), you may skip this step.
9+
We recommend installing the [`MSYS2`](https://www.msys2.org/) subsystem for simplicity. This can be done following the 7 steps in their webpage. These consist of downloading and executing the installer and executing some very well-explained commands. With a fast internet connection it should take no more than 15 minutes. If you already did it when install [LAL from sources](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/instructions/installation-library-sources-windows.md), you may skip this step.
1010

1111
## Installing the dependencies
1212

@@ -36,7 +36,7 @@ The following command will install `epstopdf` and `ghostscript` and other softwa
3636

3737
### LAL
3838

39-
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/blob/master/README.md)) of that project.
39+
Install LAL either from binaries or sources (see the [main README file](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/README.md)) of that project.
4040

4141
## Download the source code of the python interface
4242

@@ -51,7 +51,7 @@ In order to compile the interface, you have to configure two build scripts (chan
5151
- the location of the python binaries and header development files,
5252
- the location where LAL has been installed in the system.
5353

54-
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/blob/main/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
54+
With this information, you will have to edit the [sample script file](https://github.com/LAL-project/python-interface/tree/24.10/sample_script.sh). Fill in the values of the variables named in upper case. Those variables with '(?)' to their right can be left empty.
5555

5656
LAL_HEADERS= # directory of the header files of LAL
5757
LAL_LIBRARY= # directory of the binary files of LAL (.so)
@@ -61,7 +61,7 @@ With this information, you will have to edit the [sample script file](https://gi
6161
PYTHON_HEADERS= # directory of the header (development) files of python
6262
PYTHON_LIBRARY= # directory of the shared object (development) files of python
6363

64-
Check the other [two](https://github.com/LAL-project/python-interface/blob/main/windows_compile_distribution.sh) [script](https://github.com/LAL-project/python-interface/blob/main/windows_install.sh) files to see examples of contents.
64+
Check the other [two](https://github.com/LAL-project/python-interface/tree/24.10/windows_compile_distribution.sh) [script](https://github.com/LAL-project/python-interface/tree/24.10/windows_install.sh) files to see examples of contents.
6565

6666
## Compiling and installing the interface
6767

@@ -104,7 +104,7 @@ In our most recent build, these were:
104104
C:/msys64/mingw64/bin/libstdc++-6.dll
105105
C:/msys64/mingw64/bin/libwinpthread-1.dll
106106

107-
Copy the dll files to both directories `lal` and `laloptimized` within conda installation. Also, if the files generated during the [debug and release compilation of LAL's sources](https://github.com/LAL-project/linear-arrangement-library/blob/master/instructions/installation-library-sources-windows.md) are not accessible in the path, then move the files
107+
Copy the dll files to both directories `lal` and `laloptimized` within conda installation. Also, if the files generated during the [debug and release compilation of LAL's sources](https://github.com/LAL-project/linear-arrangement-library/tree/24.10/instructions/installation-library-sources-windows.md) are not accessible in the path, then move the files
108108

109109
- `liblal.dll` into `lal` (within conda), and
110110
- `liblaloptimized.dll` into `laloptimized` (within conda).

make_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
###########################################################################
22
#
33
# SWIG-generated python wrapper for the Linear Arrangement Library
4-
# Copyright (C) 2021-2023 LAL-project developers
4+
# Copyright (C) 2021 - 2024 LAL-project developers
55
# Lluís Alemany Puig
66
#
77
# This program is free software: you can redistribute it and/or modify

ubuntu_compile_distribution.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
LAL_HEADERS="$HOME/Documents/projects/LAL-dev/latest/c++-libs/include"
4-
LAL_LIBRARY="$HOME/Documents/projects/LAL-dev/latest/c++-libs/lib"
3+
LAL_HEADERS="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/include"
4+
LAL_LIBRARY="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/lib"
55

66
if [ -z $1 ]; then
77

ubuntu_install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if [ -z $1 ]; then
44

5-
lal_dist_dir="$HOME/Documents/projects/LAL-dev/latest/python-libs"
5+
lal_dist_dir="$HOME/Documents/projects/LAL-dev/24.10/python-libs"
66

77
./compile.sh \
88
--destination-directory="$lal_dist_dir" \
@@ -14,7 +14,7 @@ lal_dist_dir="$HOME/Documents/projects/LAL-dev/latest/python-libs"
1414
--build=debug \
1515
--install
1616

17-
lal_lib_dir="$HOME/Documents/projects/LAL-dev/latest/c++-libs/lib"
17+
lal_lib_dir="$HOME/Documents/projects/LAL-dev/24.10/c++-libs/lib"
1818

1919
cp -P $lal_lib_dir/liblal*.so* $lal_dist_dir/
2020

windows_compile_distribution.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
LAL_HEADERS="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-c++-libs-msys64/include"
4-
LAL_LIBRARY="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-c++-libs-msys64/bin"
3+
LAL_HEADERS="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-c++-libs-msys64/include"
4+
LAL_LIBRARY="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-c++-libs-msys64/bin"
55

66
if [ -z $1 ]; then
77

windows_install.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ anaconda_package_dir="$anaconda_dir/Lib/site-packages"
2929
--install
3030

3131
lal_dist_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION"
32-
lal_cpp_dir="$lal_dist_dir/latest/windows10-c++-libs-msys64"
32+
lal_cpp_dir="$lal_dist_dir/24.10/windows10-c++-libs-msys64"
3333

3434
# lal dlls
3535
cp $lal_cpp_dir/bin/liblal*.dll $dest_dir/lal
@@ -44,7 +44,7 @@ cp $lal_dist_dir/libwinpthread-1.dll $anaconda_dir
4444
# for developers only
4545
elif [ "$1" == "package" ]; then
4646

47-
dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-python3-libs-anaconda"
47+
dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/24.10/windows10-python3-libs-anaconda"
4848

4949
./compile.sh \
5050
--destination-directory="$dest_dir" \
@@ -57,7 +57,7 @@ dest_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION/latest/windows10-python3-libs-
5757
--install
5858

5959
lal_dist_dir="C:/Users/$USER/Desktop/LAL-DISTRIBUTION"
60-
lal_cpp_dir="$lal_dist_dir/latest/windows10-c++-libs-msys64"
60+
lal_cpp_dir="$lal_dist_dir/24.10/windows10-c++-libs-msys64"
6161

6262
# lal dlls
6363
cp $lal_cpp_dir/bin/liblal.dll $dest_dir/lal

0 commit comments

Comments
 (0)