Skip to content

Commit

Permalink
Merge pull request #1772 from willend/main
Browse files Browse the repository at this point in the history
No repo solution for 3.5.12
  • Loading branch information
willend authored Nov 22, 2024
2 parents 8e77d28 + ddda9b2 commit f86398d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 98 deletions.
7 changes: 3 additions & 4 deletions INSTALL-McStas/Linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
## Official Debian packages
We are currently in transition to provide McStas via the official Debian repository, see [packages.debian.org](https://packages.debian.org/search?keywords=mcstas&searchon=names&suite=all&section=all)

Until McStas is broadly available in Debian/Ubuntu, you may also use our own mccode.org repo:
Until McStas is broadly available in Debian/Ubuntu, you may also use our own mccode.org packages:

## The repo way
The preferred way of installing on Debian/Ubuntu systems is by adding our respective **deb** or **rpm** repository!!! Please consult the
specific [Debian/Ubuntu](debian/README.md).
## Our own Debian packages
Please consult the specific [Debian/Ubuntu](debian/README.md).

## Other Linux
As of 3.5.12 we no longer build for RPM based systems. Please use our [conda-forge](../conda/README.md) packages instead.
Expand Down
49 changes: 4 additions & 45 deletions INSTALL-McStas/Linux/debian/README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,11 @@
## Install McStas 3.5.12 On Debian class systems (including Ubuntu, mint etc.):
The packages have been tested to work correctly on Ubuntu 22.04 and Debian 11.

# Add the McCode repository
After following the below steps your package manager should now be aware of mcstas
```bash
cd /etc/apt/sources.list.d
sudo wget https://packages.mccode.org/debian/mccode.list
sudo apt-get update
```

# Debian only:
On Debian you will further have to install the non-free repository to have access to all McStas tool parts. See https://wiki.debian.org/SourcesList
# For McStas 3.5.12 only, installation includes the following manual steps:

# Look for McStas packages to install
```bash
mcstas@debian:~$ apt-cache search mcstas | grep -v 2.
mcstas-3.5.12 - mcstas built using CMake
mcstas-comps-3.5.12 - mcstas-comps built using CMake
mcstas-manuals-3.5.12 - mcstas_manuals built using CMake
mcstas-suite - A metapackage for McStas + perl and python tools
mcstas-suite-python - A metapackage for McStas + python tools
mcstas-tools-matlab-mcplot-3.5.12 - matlab-tools-mcplot built using CMake
mcstas-tools-python-mccodelib-3.5.12 - python-tools-mccodelib built using CMake
mcstas-tools-python-mcdisplay-mantid-3.5.12 - python-tools-mcdisplay-mantid built using CMake
mcstas-tools-python-mcdisplay-pyqtgraph-3.5.12 - python-tools-mcdisplay-pyqtgraph built using CMake
mcstas-tools-python-mcdisplay-webgl-3.5.12 - python-tools-mcdisplay-webgl built using CMake
mcstas-tools-python-mcgui-3.5.12 - python-tools-mcgui built using CMake
mcstas-tools-python-mcplot-pyqtgraph-3.5.12 - python-tools-mcplot-pyqtgraph built using CMake
mcstas-tools-python-mcrun-3.5.12 - python-tools-mcrun built using CMake
```
The meta-package mcstas-suite-python
allows you to install mcstas 3.5.12 with one or both sets of tools (mcrun/mcplot etc.) by simple apt-get commands like
```bash
sudo apt-get install mcstas-suite-python
```
The -suite packages without 'ng' in the package name will install the
latest McStas 2.x package
1. Please **uninstall** McStas 3.5.1 if it exists on your system
2. Please manually download the 3.5.12 packages from https://download.mcstas.org/mcstas-3.5.12/Linux/debian/
3. Unpack and install the packages using e.g. dpkg

# Using mcdoc on modern Ubuntu systems
Ubuntu is shipping its browsers as "snap" packages, meaning that they
Expand Down Expand Up @@ -72,17 +42,6 @@ Finally, install firefox from the mozilla-channels
sudo apt install firefox
```

# Optionals
Optionally install iFit to visualize results using a Matlab environment (for free, no license needed).
Optionally install a VRML/X3D plotter such as Freewrl or InstantReality.
Optionally, you can install the NeXus format libraries to be able to export data files in HDF5.
Please report any trouble with the repository to [mcstas-users](mailto:[email protected])

# Installing without adding the repo
If you want to attempt installing our debian packages manually via
dpkg, the packages are available for download at https://download.mcstas.org/mcstas-3.5.12/Linux/debian/
(available for multiple processor architectures).

## In case of issues
Please report any trouble with the repository to [mcstas-users](mailto:[email protected])

Expand Down
7 changes: 3 additions & 4 deletions INSTALL-McXtrace/Linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
## Official Debian packages
We are currently in transition to provide McXtrace via the official Debian repository, see [packages.debian.org](https://packages.debian.org/search?keywords=mcxtrace&searchon=names&suite=all&section=all)

Until McXtrace is broadly available in Debian/Ubuntu, you may also use our own mccode.org repo:
Until McXtrace is broadly available in Debian/Ubuntu, you may also use our own mccode.org packages:

## The repo way
The preferred way of installing on Debian/Ubuntu systems is by adding our respective **deb** or **rpm** repository!!! Please consult the
specific [Debian/Ubuntu](debian/README.md).
## Our own Debian packages
Please consult the specific [Debian/Ubuntu](debian/README.md).

## Other Linux
As of 3.5.12 we no longer build for RPM based systems. Please use our [conda-forge](../conda/README.md) packages instead.
Expand Down
49 changes: 4 additions & 45 deletions INSTALL-McXtrace/Linux/debian/README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,11 @@
## Install McXtrace 3.5.12 On Debian class systems (including Ubuntu, mint etc.):
The packages have been tested to work correctly on Ubuntu 22.04 and Debian 11.

# Add the McCode repository
After following the below steps your package manager should now be aware of mcxtrace
```bash
cd /etc/apt/sources.list.d
sudo wget https://packages.mccode.org/debian/mccode.list
sudo apt-get update
```

# Debian only:
On Debian you will further have to install the non-free repository to have access to all McXtrace tool parts. See https://wiki.debian.org/SourcesList
# For McXtrace 3.5.12 only, installation includes the following manual steps:

# Look for McXtrace packages to install
```bash
mcxtrace@debian:~$ apt-cache search mcxtrace | grep -v 2.
mcxtrace-3.5.12 - mcxtrace built using CMake
mcxtrace-comps-3.5.12 - mcxtrace-comps built using CMake
mcxtrace-manuals-3.5.12 - mcxtrace_manuals built using CMake
mcxtrace-suite - A metapackage for McXtrace + perl and python tools
mcxtrace-suite-python - A metapackage for McXtrace + python tools
mcxtrace-tools-matlab-mcplot-3.5.12 - matlab-tools-mcplot built using CMake
mcxtrace-tools-python-mccodelib-3.5.12 - python-tools-mccodelib built using CMake
mcxtrace-tools-python-mcdisplay-mantid-3.5.12 - python-tools-mcdisplay-mantid built using CMake
mcxtrace-tools-python-mcdisplay-pyqtgraph-3.5.12 - python-tools-mcdisplay-pyqtgraph built using CMake
mcxtrace-tools-python-mcdisplay-webgl-3.5.12 - python-tools-mcdisplay-webgl built using CMake
mcxtrace-tools-python-mcgui-3.5.12 - python-tools-mcgui built using CMake
mcxtrace-tools-python-mcplot-pyqtgraph-3.5.12 - python-tools-mcplot-pyqtgraph built using CMake
mcxtrace-tools-python-mcrun-3.5.12 - python-tools-mcrun built using CMake
```
The meta-package mcxtrace-suite-python
allows you to install mcxtrace 3.5.12 with one or both sets of tools (mcrun/mcplot etc.) by simple apt-get commands like
```bash
sudo apt-get install mcxtrace-suite-python
```
The -suite packages without 'ng' in the package name will install the
latest McXtrace 2.x package
1. Please **uninstall** McXtrace 3.5.1 if it exists on your system
2. Please manually download the 3.5.12 packages from https://download.mcxtrace.org/mcxtrace-3.5.12/Linux/debian/
3. Unpack and install the packages using e.g. dpkg

# Using mcdoc on modern Ubuntu systems
Ubuntu is shipping its browsers as "snap" packages, meaning that they
Expand Down Expand Up @@ -72,17 +42,6 @@ Finally, install firefox from the mozilla-channels
sudo apt install firefox
```

# Optionals
Optionally install iFit to visualize results using a Matlab environment (for free, no license needed).
Optionally install a VRML/X3D plotter such as Freewrl or InstantReality.
Optionally, you can install the NeXus format libraries to be able to export data files in HDF5.
Please report any trouble with the repository to [mcxtrace-users](mailto:[email protected])

# Installing without adding the repo
If you want to attempt installing our debian packages manually via
dpkg, the packages are available for download at https://download.mcxtrace.org/mcxtrace-3.5.12/Linux/debian/
(available for multiple processor architectures).

## In case of issues
Please report any trouble with the repository to [mcxtrace-users](mailto:[email protected])

Expand Down

0 comments on commit f86398d

Please sign in to comment.