Skip to content
This repository was archived by the owner on Sep 29, 2022. It is now read-only.

Commit 0564278

Browse files
mutirrimutirri
committed
Merge branch 'master' into kkwiek/recipes
2 parents 58e8cd6 + 8372aaa commit 0564278

File tree

1,752 files changed

+4598
-1614
lines changed

Some content is hidden

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

1,752 files changed

+4598
-1614
lines changed

‎.binstar.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
# Notes:
3+
# This .binstar.yml file controls CI testing of this repo
4+
# Adaptations for other uses may change the package name
5+
# or user.
6+
7+
after_failure:
8+
- echo "After failure message!"
9+
after_script:
10+
- echo "ProtoCI build was a:$BINSTAR_BUILD_RESULT" | tee artifact1.txt
11+
after_success:
12+
- echo "ProtoCI BUILD SUCCESS"
13+
before_script:
14+
- echo "Prepare to clone conda and conda-build for metadata reading..."
15+
- mkdir conda_tmp
16+
# avoid conflict with conda or conda-build dirs if already there
17+
- git clone https://github.com/conda/conda-build conda_tmp/conda-build
18+
- git clone https://github.com/conda/conda conda_tmp/conda
19+
- export PYTHONPATH=$PYTHONPATH:./conda_tmp/conda-build:./conda_tmp/conda
20+
- echo "PYTHONPATH below should include ./conda_tmp"
21+
- echo $PYTHONPATH
22+
- conda install -c psteinberg protoci
23+
- conda config --add channels r
24+
engine:
25+
- python=2.7
26+
- python=3.4
27+
- python=3.5
28+
script:
29+
- protoci-difference-build .
30+
install_channels:
31+
- defaults
32+
- python
33+
- r
34+
package: conda-recipes
35+
platform:
36+
- linux-64
37+
- osx-64
38+
- win-64
39+
- win-32
40+
# anaconda.org username or org name:
41+
user: conda-team
42+
# suppress print of messages ending in \r (interactive ones)
43+
quiet: True
44+
#timeout after N seconds without IO
45+
iotimeout: 200

‎README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
## Important Note
2+
3+
This repository has grown to well over 500 packages, and we are doing some housekeeping. We are currently in the process of moving most/all python packages into the `python` root directory. From there, we'll continue tidying up the root diretory with categories as appropriate.
4+
15
# Conda Recipes
26

3-
Example recipes for the new conda build system. Use
7+
Example recipes for the conda build system. Use
48

59
conda build <recipe directory>
610

7-
You have to use conda >= 1.7
8-
[conda](https://github.com/continuumio/conda).
11+
This is a community repository. These recipes are not necessarily those used to create the [Anaconda Python Distribution](https://www.continuum.io/downloads).
912

1013
See http://conda.pydata.org/docs/building/build.html for information on how to make a recipe,
1114
or just look at the examples here.

‎boost/bld.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ if errorlevel 1 exit 1
2929
if errorlevel 1 exit 1
3030

3131
:: Install fix-up for a non version-specific boost include
32-
move %LIBRARY_INC%\boost-1_59\boost %LIBRARY_INC%
32+
move %LIBRARY_INC%\boost-1_60\boost %LIBRARY_INC%
3333
if errorlevel 1 exit 1
3434

3535
:: Move dll's to LIBRARY_BIN
36-
move %LIBRARY_LIB%\*vc%LIB_VER%-mt-1_59.dll "%LIBRARY_BIN%"
36+
move %LIBRARY_LIB%\*vc%LIB_VER%-mt-1_60.dll "%LIBRARY_BIN%"
3737
if errorlevel 1 exit 1

‎boost/meta.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package:
22
name: boost
3-
version: 1.59.0
3+
version: 1.60.0
44

55
source:
6-
fn: boost_1_59_0.tar.bz2
7-
url: http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.bz2
8-
md5: 6aa9a5c6a4ca1016edd0ed1178e3cb87
6+
fn: boost_1_60_0.tar.bz2
7+
url: http://sourceforge.net/projects/boost/files/boost/1.60.0/boost_1_60_0.tar.bz2
8+
md5: 65a840e1a0b13a558ff19eeb2c4f0cbe
99

1010
build:
1111
features:

‎chardet/bld.bat renamed to ‎cloudpickle/bld.bat

File renamed without changes.

‎abstract-rendering/build.sh renamed to ‎cloudpickle/build.sh

File renamed without changes.

‎cloudpickle/meta.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package:
2+
name: cloudpickle
3+
version: "0.1.1"
4+
5+
source:
6+
fn: cloudpickle-0.1.1.tar.gz
7+
url: https://pypi.python.org/packages/source/c/cloudpickle/cloudpickle-0.1.1.tar.gz
8+
md5: 47376a2fa209283b5e6d05b36eecdb5a
9+
10+
build:
11+
number: 0
12+
13+
requirements:
14+
build:
15+
- python
16+
- setuptools
17+
18+
run:
19+
- python
20+
21+
test:
22+
imports:
23+
- cloudpickle
24+
25+
about:
26+
home: https://github.com/cloudpipe/cloudpickle
27+
license: BSD License
28+
summary: 'Extended pickling support for Python objects'

‎cmake/meta.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
package:
22
name: cmake
3-
version: 3.3.1
3+
version: 3.4.3
44

55
source:
6-
fn: cmake-3.3.1.tar.gz
7-
url: http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz
8-
md5: 52638576f4e1e621fed6c3410d3a1b12
6+
fn: cmake-3.4.3.tar.gz
7+
url: http://www.cmake.org/files/v3.4/cmake-3.4.3.tar.gz
8+
sha1: 49e4f05d46d4752e514b19ba36bf97d20a7da66a
9+
10+
requirements:
11+
build:
12+
- gcc # [unix]
13+
run:
14+
- libgcc # [unix]
915

1016
test:
1117
commands:
@@ -14,3 +20,4 @@ test:
1420
about:
1521
home: http://www.cmake.org/
1622
license: BSD
23+
summary: A cross-platform open-source make system

‎conda/bld.bat

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎freeimage/Makefile.osx.patch

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
diff --git Makefile.osx Makefile.osx
2+
index c56dd9b..8a8cd3f 100755
3+
--- Makefile.osx
4+
+++ Makefile.osx
5+
@@ -5,46 +5,25 @@
6+
include Makefile.srcs
7+
8+
# General configuration variables:
9+
-CC_PPC = gcc-4.0
10+
-CC_I386 = gcc-4.0
11+
-CC_X86_64 = gcc-4.0
12+
-CPP_PPC = g++-4.0
13+
-CPP_I386 = g++-4.0
14+
-CPP_X86_64 = g++-4.0
15+
-COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS
16+
-COMPILERFLAGS_PPC = -arch ppc
17+
-COMPILERFLAGS_I386 = -arch i386
18+
+CC_X86_64 = gcc
19+
+CPP_X86_64 = g++
20+
+COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DDISABLE_PERF_MEASUREMENT
21+
COMPILERFLAGS_X86_64 = -arch x86_64
22+
COMPILERPPFLAGS = -Wno-ctor-dtor-privacy
23+
-INCLUDE +=
24+
-INCLUDE_PPC = -isysroot /Developer/SDKs/MacOSX10.5.sdk
25+
-INCLUDE_I386 = -isysroot /Developer/SDKs/MacOSX10.5.sdk
26+
-INCLUDE_X86_64 = -isysroot /Developer/SDKs/MacOSX10.6.sdk
27+
-CFLAGS_PPC = $(COMPILERFLAGS) $(COMPILERFLAGS_PPC) $(INCLUDE) $(INCLUDE_PPC)
28+
-CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386)
29+
CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64)
30+
-CPPFLAGS_PPC = $(COMPILERPPFLAGS) $(CFLAGS_PPC)
31+
-CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386)
32+
CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64)
33+
-LIBRARIES_PPC = -Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk
34+
-LIBRARIES_I386 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk
35+
-LIBRARIES_X86_64 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk
36+
LIBTOOL = libtool
37+
LIPO = lipo
38+
39+
TARGET = freeimage
40+
STATICLIB = lib$(TARGET).a
41+
SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib
42+
-LIBNAME = lib$(TARGET).$(VER_MAJOR).dylib
43+
+LIBNAME = lib$(TARGET).dylib
44+
HEADER = Source/FreeImage.h
45+
46+
-.SUFFIXES: .o-ppc .o-i386 .o-x86_64
47+
-MODULES_PPC = $(SRCS:.c=.o-ppc)
48+
-MODULES_I386 = $(SRCS:.c=.o-i386)
49+
-MODULES_X86_64 = $(SRCS:.c=.o-x86_64)
50+
-MODULES_PPC := $(MODULES_PPC:.cpp=.o-ppc)
51+
-MODULES_I386 := $(MODULES_I386:.cpp=.o-i386)
52+
-MODULES_X86_64 := $(MODULES_X86_64:.cpp=.o-x86_64)
53+
+.SUFFIXES: .o
54+
+MODULES_X86_64 = $(SRCS:.c=.o)
55+
+MODULES_X86_64 := $(MODULES_X86_64:.cpp=.o)
56+
57+
PREFIX = /usr/local
58+
INSTALLDIR = $(PREFIX)/lib
59+
@@ -55,61 +34,30 @@ default: all
60+
all: dist
61+
62+
dist: FreeImage
63+
- mkdir -p Dist
64+
- cp *.a Dist/
65+
- cp *.dylib Dist/
66+
- cp Source/FreeImage.h Dist/
67+
+ cp *.a Dist
68+
+ cp *.dylib Dist
69+
+ cp Source/FreeImage.h Dist
70+
71+
FreeImage: $(STATICLIB) $(SHAREDLIB)
72+
73+
-$(STATICLIB): $(STATICLIB)-ppc $(STATICLIB)-i386 $(STATICLIB)-x86_64
74+
- $(LIPO) -create $(STATICLIB)-ppc $(STATICLIB)-i386 $(STATICLIB)-x86_64 -output $(STATICLIB)
75+
-
76+
-$(STATICLIB)-ppc: $(MODULES_PPC)
77+
- $(LIBTOOL) -arch_only ppc -o $@ $(MODULES_PPC)
78+
-
79+
-$(STATICLIB)-i386: $(MODULES_I386)
80+
- $(LIBTOOL) -arch_only i386 -o $@ $(MODULES_I386)
81+
-
82+
-$(STATICLIB)-x86_64: $(MODULES_X86_64)
83+
+$(STATICLIB): $(MODULES_X86_64)
84+
$(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64)
85+
86+
-$(SHAREDLIB): $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
87+
- $(LIPO) -create $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
88+
-
89+
-$(SHAREDLIB)-ppc: $(MODULES_PPC)
90+
- $(CPP_PPC) -arch ppc -dynamiclib $(LIBRARIES_PPC) -o $@ $(MODULES_PPC)
91+
-
92+
-$(SHAREDLIB)-i386: $(MODULES_I386)
93+
- $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
94+
-
95+
-$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
96+
+$(SHAREDLIB): $(MODULES_X86_64)
97+
$(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64)
98+
99+
-.c.o-ppc:
100+
- $(CC_PPC) $(CFLAGS_PPC) -c $< -o $@
101+
-
102+
-.c.o-i386:
103+
- $(CC_I386) $(CFLAGS_I386) -c $< -o $@
104+
-
105+
-.c.o-x86_64:
106+
+.c.o:
107+
$(CC_X86_64) $(CFLAGS_X86_64) -c $< -o $@
108+
109+
-.cpp.o-ppc:
110+
- $(CPP_PPC) $(CPPFLAGS_PPC) -c $< -o $@
111+
-
112+
-.cpp.o-i386:
113+
- $(CPP_I386) $(CPPFLAGS_I386) -c $< -o $@
114+
-
115+
-.cpp.o-x86_64:
116+
+.cpp.o:
117+
$(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@
118+
119+
install:
120+
- install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)
121+
- install -m 644 -o root -g wheel $(HEADER) $(INCDIR)
122+
- install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
123+
+ install -d -m 755 $(INCDIR) $(INSTALLDIR)
124+
+ install -m 644 $(HEADER) $(INCDIR)
125+
+ install -m 644 $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
126+
ranlib -sf $(INSTALLDIR)/$(STATICLIB)
127+
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
128+
129+
clean:
130+
- rm -f core Dist/*.* u2dtmp* $(MODULES_PPC) $(MODULES_I386) $(MODULES_X86_64) $(STATICLIB) $(STATICLIB)-ppc $(STATICLIB)-i386 $(SHAREDLIB) $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
131+
+ rm -f core Dist/*.* u2dtmp* $(MODULES_X86_64) $(STATICLIB) $(SHAREDLIB) $(SHAREDLIB)

0 commit comments

Comments
 (0)