Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps #72

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Deps #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c468113
build string for all
gidden Jun 2, 2015
1d14258
fix up glib build script
gidden Jun 2, 2015
298e3c8
cyclus deps updates. fully installs cyclus and cycamore from source o…
gidden Jun 2, 2015
614ee7c
update cyclist version
gidden Jun 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda-recipes/boost/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.gz

build:
number: 2 [osx]
number: 0
requirements:
build:
- xz
Expand Down
4 changes: 2 additions & 2 deletions conda-recipes/cyclist/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package:
name: cyclist
version: 0.9.3
version: 1.3

source:
# keep these commented lines for batlab
#fn: 0.9.3.tar.gz
#url: https://github.com/cyclus/cyclist2/archive/0.9.3.tar.gz
git_url: http://github.com/cyclus/cyclist2.git
git_tag: 0.9.3
git_branch: v1.3.0-release

requirements:
build:
Expand Down
22 changes: 14 additions & 8 deletions conda-recipes/cyclus-deps/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
package:
name: cyclus-deps
version: 1.0
version: 9999

source:
#fn: develop.zip # [linux]
#url: https://github.com/cyclus/cyclus/archive/develop.zip # [linux]
git_url: https://github.com/cyclus/cyclus.git
git_tag: develop #17716084c828a56964c36cf7c5e8c9a0aba39fde
requirements:
build:
- sigcpp
- myglib
- glibmm
- libxmlpp
- libxmlpp
- bzip2
- coincbc
- boost
- hdf5
Expand All @@ -23,10 +20,15 @@ requirements:
- pkg-config-lite # [osx]
- cmake
- python
- nose
- pytables

run:
- sigcpp
- myglib
- glibmm
- libxmlpp
- bzip2
- coincbc
- boost
- hdf5
Expand All @@ -36,9 +38,13 @@ requirements:
- libffi # [osx]
- gettext # [osx]
- pkg-config-lite # [osx]
- cmake
- python
- nose
- pytables

build:
number: 2
string: 0

about:
home: Cyclus
Expand Down
29 changes: 1 addition & 28 deletions conda-recipes/cyclus-deps/post-link.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,3 @@
#/bin/bash

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this just means I don't understand conda well enough, but why don't we need any of this anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First, I think conda explicitly calls bash <script name>. Second, this was missing the shebang anyway and wouldn't have worked =/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about the whole file being deleted but just tagged it on this line.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah (it is mostly being delted, not wholy, FWIW). This looks to have been
directly copied from the cyclus conda recipe. It assumes that cyclus was
actually installed (hence playing with the executable name). Cyclus-deps
does not install cyclus.

On Wed, Jun 3, 2015 at 10:40 AM, Paul Wilson [email protected]
wrote:

In conda-recipes/cyclus-deps/post-link.sh
#72 (comment):

@@ -1,30 +1,3 @@
-#/bin/bash

I was wondering about the whole file being deleted but just tagged it on
this line.

—
Reply to this email directly or view it on GitHub
https://github.com/cyclus/release/pull/72/files#r31636783.

Matthew Gidden, Ph.D.
Postdoctoral Associate, Nuclear Engineering
The University of Wisconsin -- Madison
Ph. 225.892.3192

mv $PREFIX/bin/cyclus $PREFIX/bin/cyclus_base
echo "
#!/bin/bash
export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib/cyclus
export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus
export CYCLUS_NUC_DATA=$PREFIX/share/cyclus/cyclus_nuc_data.h5
export CYCLUS_PATH=$PREFIX/lib/cyclus
export CYCLUS_RNG_SCHEMA=$PREFIX/share/cyclus/cyclus.rng.in

$PREFIX/bin/cyclus_base \$*

" > $PREFIX/bin/cyclus
chmod 755 $PREFIX/bin/cyclus

mv $PREFIX/bin/cyclus_unit_tests $PREFIX/bin/cyclus_unit_tests_base
echo "
#!/bin/bash
export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib/cyclus
export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus
export CYCLUS_NUC_DATA=$PREFIX/share/cyclus/cyclus_nuc_data.h5
export CYCLUS_PATH=$PREFIX/lib/cyclus
export CYCLUS_RNG_SCHEMA=$PREFIX/share/cyclus/cyclus.rng.in

$PREFIX/bin/cyclus_unit_tests_base \$*

" > $PREFIX/bin/cyclus_unit_tests
chmod 755 $PREFIX/bin/cyclus_unit_tests
echo "post-link.sh, PREFIX: $PREFIX"

2 changes: 1 addition & 1 deletion conda-recipes/gettext/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://ftp.gnu.org/gnu/gettext/gettext-0.18.3.tar.gz

build:
number: 2 [osx]
number: 0

requirements:
build:
Expand Down
4 changes: 3 additions & 1 deletion conda-recipes/glib/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ set -e
#PKG_CONFIG_PATH=
#./configure -h
export DYLD_LIBRARY_PATH=$PREFIX/lib
./configure --prefix=$PREFIX PKG_CONFIG=$PREFIX/bin/pkg-config PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig LD_LIBRARY_PATH=/$PREFIX/lib/ CPPFLAGS=-I/$PREFIX/include LDFLAGS=-L/$PREFIX/lib
export LIBFFI_CFLAGS=-I$PREFIX/lib/libffi-3.0.11/include
export LIBFFI_LIBS="-L$PREFIX/lib -lffi"
./configure --prefix=$PREFIX PKG_CONFIG=$PREFIX/bin/pkg-config PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig LD_LIBRARY_PATH=$PREFIX/lib/ CPPFLAGS=-I$PREFIX/include LDFLAGS=-L$PREFIX/lib
make
make install

Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/glib/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.37/glib-2.37.4.tar.xz

build:
number: 2 [osx]
number: 0

# the build and runtime requirements. Dependencies of these requirements
# # are included automatically.
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/glibmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.32/glibmm-2.32.1.tar.xz

build:
number: 2 [osx]
number: 0

# the build and runtime requirements. Dependencies of these requirements
# # are included automatically.
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/libffi/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz

build:
number: 2 [osx]
number: 0

about:
home: libffi
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/libxml2/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz

build:
number: 2 [osx]
number: 0

requirements:
build:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/libxmlpp/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.36/libxml++-2.36.0.tar.xz

build:
number: 2 [osx]
number: 0

requirements:
build:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/pkg-config-lite/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-lite-0.28-1.tar.gz

build:
number: 2 [osx]
number: 0


about:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/sigcpp/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz

build:
number: 2 [osx]
number: 0


about:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/xz/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source:
url: http://tukaani.org/xz/xz-5.0.5.tar.gz

build:
number: 2 [osx]
number: 0

about:
home: tukaani
Expand Down