This repository has been archived by the owner on Sep 29, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into kkwiek/recipes
- Loading branch information
Showing
1,752 changed files
with
4,598 additions
and
1,614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
|
|
||
| # Notes: | ||
| # This .binstar.yml file controls CI testing of this repo | ||
| # Adaptations for other uses may change the package name | ||
| # or user. | ||
|
|
||
| after_failure: | ||
| - echo "After failure message!" | ||
| after_script: | ||
| - echo "ProtoCI build was a:$BINSTAR_BUILD_RESULT" | tee artifact1.txt | ||
| after_success: | ||
| - echo "ProtoCI BUILD SUCCESS" | ||
| before_script: | ||
| - echo "Prepare to clone conda and conda-build for metadata reading..." | ||
| - mkdir conda_tmp | ||
| # avoid conflict with conda or conda-build dirs if already there | ||
| - git clone https://github.com/conda/conda-build conda_tmp/conda-build | ||
| - git clone https://github.com/conda/conda conda_tmp/conda | ||
| - export PYTHONPATH=$PYTHONPATH:./conda_tmp/conda-build:./conda_tmp/conda | ||
| - echo "PYTHONPATH below should include ./conda_tmp" | ||
| - echo $PYTHONPATH | ||
| - conda install -c psteinberg protoci | ||
| - conda config --add channels r | ||
| engine: | ||
| - python=2.7 | ||
| - python=3.4 | ||
| - python=3.5 | ||
| script: | ||
| - protoci-difference-build . | ||
| install_channels: | ||
| - defaults | ||
| - python | ||
| - r | ||
| package: conda-recipes | ||
| platform: | ||
| - linux-64 | ||
| - osx-64 | ||
| - win-64 | ||
| - win-32 | ||
| # anaconda.org username or org name: | ||
| user: conda-team | ||
| # suppress print of messages ending in \r (interactive ones) | ||
| quiet: True | ||
| #timeout after N seconds without IO | ||
| iotimeout: 200 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package: | ||
| name: cloudpickle | ||
| version: "0.1.1" | ||
|
|
||
| source: | ||
| fn: cloudpickle-0.1.1.tar.gz | ||
| url: https://pypi.python.org/packages/source/c/cloudpickle/cloudpickle-0.1.1.tar.gz | ||
| md5: 47376a2fa209283b5e6d05b36eecdb5a | ||
|
|
||
| build: | ||
| number: 0 | ||
|
|
||
| requirements: | ||
| build: | ||
| - python | ||
| - setuptools | ||
|
|
||
| run: | ||
| - python | ||
|
|
||
| test: | ||
| imports: | ||
| - cloudpickle | ||
|
|
||
| about: | ||
| home: https://github.com/cloudpipe/cloudpickle | ||
| license: BSD License | ||
| summary: 'Extended pickling support for Python objects' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| diff --git Makefile.osx Makefile.osx | ||
| index c56dd9b..8a8cd3f 100755 | ||
| --- Makefile.osx | ||
| +++ Makefile.osx | ||
| @@ -5,46 +5,25 @@ | ||
| include Makefile.srcs | ||
|
|
||
| # General configuration variables: | ||
| -CC_PPC = gcc-4.0 | ||
| -CC_I386 = gcc-4.0 | ||
| -CC_X86_64 = gcc-4.0 | ||
| -CPP_PPC = g++-4.0 | ||
| -CPP_I386 = g++-4.0 | ||
| -CPP_X86_64 = g++-4.0 | ||
| -COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS | ||
| -COMPILERFLAGS_PPC = -arch ppc | ||
| -COMPILERFLAGS_I386 = -arch i386 | ||
| +CC_X86_64 = gcc | ||
| +CPP_X86_64 = g++ | ||
| +COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DDISABLE_PERF_MEASUREMENT | ||
| COMPILERFLAGS_X86_64 = -arch x86_64 | ||
| COMPILERPPFLAGS = -Wno-ctor-dtor-privacy | ||
| -INCLUDE += | ||
| -INCLUDE_PPC = -isysroot /Developer/SDKs/MacOSX10.5.sdk | ||
| -INCLUDE_I386 = -isysroot /Developer/SDKs/MacOSX10.5.sdk | ||
| -INCLUDE_X86_64 = -isysroot /Developer/SDKs/MacOSX10.6.sdk | ||
| -CFLAGS_PPC = $(COMPILERFLAGS) $(COMPILERFLAGS_PPC) $(INCLUDE) $(INCLUDE_PPC) | ||
| -CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) | ||
| CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) | ||
| -CPPFLAGS_PPC = $(COMPILERPPFLAGS) $(CFLAGS_PPC) | ||
| -CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) | ||
| CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64) | ||
| -LIBRARIES_PPC = -Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk | ||
| -LIBRARIES_I386 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk | ||
| -LIBRARIES_X86_64 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk | ||
| LIBTOOL = libtool | ||
| LIPO = lipo | ||
|
|
||
| TARGET = freeimage | ||
| STATICLIB = lib$(TARGET).a | ||
| SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib | ||
| -LIBNAME = lib$(TARGET).$(VER_MAJOR).dylib | ||
| +LIBNAME = lib$(TARGET).dylib | ||
| HEADER = Source/FreeImage.h | ||
|
|
||
| -.SUFFIXES: .o-ppc .o-i386 .o-x86_64 | ||
| -MODULES_PPC = $(SRCS:.c=.o-ppc) | ||
| -MODULES_I386 = $(SRCS:.c=.o-i386) | ||
| -MODULES_X86_64 = $(SRCS:.c=.o-x86_64) | ||
| -MODULES_PPC := $(MODULES_PPC:.cpp=.o-ppc) | ||
| -MODULES_I386 := $(MODULES_I386:.cpp=.o-i386) | ||
| -MODULES_X86_64 := $(MODULES_X86_64:.cpp=.o-x86_64) | ||
| +.SUFFIXES: .o | ||
| +MODULES_X86_64 = $(SRCS:.c=.o) | ||
| +MODULES_X86_64 := $(MODULES_X86_64:.cpp=.o) | ||
|
|
||
| PREFIX = /usr/local | ||
| INSTALLDIR = $(PREFIX)/lib | ||
| @@ -55,61 +34,30 @@ default: all | ||
| all: dist | ||
|
|
||
| dist: FreeImage | ||
| - mkdir -p Dist | ||
| - cp *.a Dist/ | ||
| - cp *.dylib Dist/ | ||
| - cp Source/FreeImage.h Dist/ | ||
| + cp *.a Dist | ||
| + cp *.dylib Dist | ||
| + cp Source/FreeImage.h Dist | ||
|
|
||
| FreeImage: $(STATICLIB) $(SHAREDLIB) | ||
|
|
||
| -$(STATICLIB): $(STATICLIB)-ppc $(STATICLIB)-i386 $(STATICLIB)-x86_64 | ||
| - $(LIPO) -create $(STATICLIB)-ppc $(STATICLIB)-i386 $(STATICLIB)-x86_64 -output $(STATICLIB) | ||
| - | ||
| -$(STATICLIB)-ppc: $(MODULES_PPC) | ||
| - $(LIBTOOL) -arch_only ppc -o $@ $(MODULES_PPC) | ||
| - | ||
| -$(STATICLIB)-i386: $(MODULES_I386) | ||
| - $(LIBTOOL) -arch_only i386 -o $@ $(MODULES_I386) | ||
| - | ||
| -$(STATICLIB)-x86_64: $(MODULES_X86_64) | ||
| +$(STATICLIB): $(MODULES_X86_64) | ||
| $(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64) | ||
|
|
||
| -$(SHAREDLIB): $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 | ||
| - $(LIPO) -create $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) | ||
| - | ||
| -$(SHAREDLIB)-ppc: $(MODULES_PPC) | ||
| - $(CPP_PPC) -arch ppc -dynamiclib $(LIBRARIES_PPC) -o $@ $(MODULES_PPC) | ||
| - | ||
| -$(SHAREDLIB)-i386: $(MODULES_I386) | ||
| - $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) | ||
| - | ||
| -$(SHAREDLIB)-x86_64: $(MODULES_X86_64) | ||
| +$(SHAREDLIB): $(MODULES_X86_64) | ||
| $(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64) | ||
|
|
||
| -.c.o-ppc: | ||
| - $(CC_PPC) $(CFLAGS_PPC) -c $< -o $@ | ||
| - | ||
| -.c.o-i386: | ||
| - $(CC_I386) $(CFLAGS_I386) -c $< -o $@ | ||
| - | ||
| -.c.o-x86_64: | ||
| +.c.o: | ||
| $(CC_X86_64) $(CFLAGS_X86_64) -c $< -o $@ | ||
|
|
||
| -.cpp.o-ppc: | ||
| - $(CPP_PPC) $(CPPFLAGS_PPC) -c $< -o $@ | ||
| - | ||
| -.cpp.o-i386: | ||
| - $(CPP_I386) $(CPPFLAGS_I386) -c $< -o $@ | ||
| - | ||
| -.cpp.o-x86_64: | ||
| +.cpp.o: | ||
| $(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@ | ||
|
|
||
| install: | ||
| - install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR) | ||
| - install -m 644 -o root -g wheel $(HEADER) $(INCDIR) | ||
| - install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) | ||
| + install -d -m 755 $(INCDIR) $(INSTALLDIR) | ||
| + install -m 644 $(HEADER) $(INCDIR) | ||
| + install -m 644 $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) | ||
| ranlib -sf $(INSTALLDIR)/$(STATICLIB) | ||
| ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) | ||
|
|
||
| clean: | ||
| - 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 | ||
| + rm -f core Dist/*.* u2dtmp* $(MODULES_X86_64) $(STATICLIB) $(SHAREDLIB) $(SHAREDLIB) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
|
|
||
| if defined ProgramFiles(x86) ( | ||
| set ARCH=x64 | ||
| ) else ( | ||
| set ARCH=Win32 | ||
| ) | ||
|
|
||
| devenv.exe FreeImage.2008.sln /Upgrade | ||
| msbuild FreeImage.2008.sln /property:Configuration=Release /property:Platform=%ARCH% | ||
|
|
||
| copy Dist\FreeImage.dll %LIBRARY_BIN%\FreeImage-3.17.0.dll | ||
| copy Dist\FreeImage.dll %LIBRARY_BIN%\FreeImage.dll | ||
| copy Dist\FreeImage.h %LIBRARY_INC%\FreeImage.h | ||
| copy Dist\FreeImage.lib %LIBRARY_LIB%\FreeImage.lib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,15 @@ | ||
| #!/bin/bash | ||
|
|
||
| export CFLAGS="-Wall -g -m64 -pipe -O2 -march=x86-64 -fPIC" | ||
| export CXXLAGS="${CFLAGS}" | ||
| export CPPFLAGS="-I${PREFIX}/include" | ||
| export LDFLAGS="-L${PREFIX}/lib" | ||
|
|
||
| cd ${SRC_DIR} || exit 1; | ||
|
|
||
| sed -i 's:-o root -g root::' Makefile* || exit 1; | ||
| LANG="C" sed -i.bak 's:-o root -g root::' Makefile* || exit 1; | ||
|
|
||
| make || exit 1; | ||
| make install DESTDIR="${PREFIX}" || exit 1; | ||
|
|
||
| mkdir -p ${PREFIX}/lib || exit 1; | ||
| mkdir -p ${PREFIX}/include || exit 1; | ||
|
|
||
| mv ${PREFIX}/usr/lib/* ${PREFIX}/lib || exit 1; | ||
| mv ${PREFIX}/usr/include/* ${PREFIX}/include || exit 1; | ||
|
|
||
| rm -rf ${PREFIX}/usr/ || exit 1; | ||
| make install PREFIX="${PREFIX}" DESTDIR="${PREFIX}" INCDIR="${PREFIX}/include" INSTALLDIR="${PREFIX}/lib" || exit 1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.