Skip to content

Commit

Permalink
Revert "Updates paths in dist/README.md"
Browse files Browse the repository at this point in the history
This reverts commit ab88b33.
  • Loading branch information
remram44 committed Nov 15, 2014
1 parent aefbe6f commit a4f05bb
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions dist/README.md
Expand Up @@ -18,9 +18,9 @@ packages need to be built from the Git tree for each type.

* Make sure `inkscape` is installed and in your path (for updating splash screen)
* Update ALPS version from http://archive.comp-phys.org/software/vistrails/
in `scripts/dist/windows/*.iss` scripts and `scripts/dist/mac/make_app`
in `dist/windows/*.iss` scripts and `dist/mac/make_app`
* Update CHANGELOG with version, branch, hash and release notes
* In `scripts/dist/common/` run `./prepare_release.py`, this updates the values
* In `dist/common/` run `./prepare_release.py`, this updates the values
from CHANGELOG where it is needed.
* Commit changes
* Create a new annotated tag, e.g.: `git tag -a v2.1.0`
Expand All @@ -40,25 +40,24 @@ The resulting files are in `dist/`.

## Anaconda

The recipe for building a Conda package is in `scripts/dist/conda/`. Packages
must be built for each OS and architecture here, typically `osx-64`, `linux-32`
and `linux-64`. Anaconda also supports Windows, but we didn't build there so
far.
The recipe for building a Conda package is in `dist/conda/`. Packages must be
built for each OS and architecture here, typically `osx-64`, `linux-32` and
`linux-64`. Anaconda also supports Windows, but we didn't build there so far.

## Mac

Set up your machine as described in [doc/dist/setup_build_system_mac.txt](doc/dist/setup_build_system_mac.txt)

Build the mac binary with:

scripts/dist/mac$ ./make_app name-of-binary
dist/mac$ ./make_app name-of-binary

## Windows

Set up your machine using as described in [doc/dist/setup_build_system_windows.txt](doc/dist/setup_build_system_windows.txt)

The Windows installer uses [Inno Setup][inno].he build scripts are in
`scripts/dist/windows/`. There are one each for 32/64 bit, and 2 more for GDAL versions.
`dist/windows/`. There are one each for 32/64 bit, and 2 more for GDAL versions.
The generated `.exe` is placed in the `.\Output\` directory.

The scripts can be run from the command line using `ISCC.exe`.
Expand Down

0 comments on commit a4f05bb

Please sign in to comment.