summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/build-scripts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-04-06 05:21:01 +0000
committerNorbert Preining <preining@logic.at>2018-04-06 05:21:01 +0000
commita11ba95f5b305c7d01cf2b6aec5640a6b1831117 (patch)
tree028e9aa29fb00177617b77a8d804a7bce694d5b0 /Build/source/utils/asymptote/build-scripts
parent0de24c07adcc80181a7aee919e1316a6149dda56 (diff)
asymptote 2.43
git-svn-id: svn://tug.org/texlive/trunk@47319 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/build-scripts')
-rw-r--r--Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows42
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asymptote4
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asymptote.dos36
3 files changed, 49 insertions, 33 deletions
diff --git a/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows b/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
index d96a8fc9876..3499bc73655 100644
--- a/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
+++ b/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
@@ -6,11 +6,12 @@ shared via virtualbox to the cygwin build environment.
Install these cygwin packages:
+git
wget
make
patch
gcc-g++
-autoconf
+autoconf2.5
bison
flex
w32api-headers
@@ -18,30 +19,21 @@ w32api-runtime
zlib-devel
libGLU-devel
libtirpc-devel (SRC)
-libncurses-devel (SRC)
libreadline-devel (SRC)
libfftw3-devel (SRC)
libgsl-devel (SRC)
-automake
+automake1.15
libtool
-ln -s /usr/include/tirpc/rpc /usr/include/rpc
-ln -s /usr/include/tirpc/netconfig.h /usr/include/netconfig.h
-ln -s /usr/lib/libtirpc.a /usr/lib/librpc.a
-
mv /usr/include/GL /usr/include/GL.orig
-Build and install from /usr/local/src:
+Build and install static libraries from /usr/local/src:
-gsl-devel
+gsl-devel:
./configure --prefix=/usr
make install
-ncurses-devel
-./configure --prefix=/usr
-make install
-
-readline-devel
+readline-devel:
./configure --prefix=/usr --without-curses --disable-shared
make install
@@ -49,12 +41,14 @@ fftw3-devel:
./configure --prefix=/usr --enable-shared
make install
-Compile static libraries from source:
-tirpc-devel
+tirpc-devel (if rpc library is unavailable):
./configure --prefix=/usr --disable-gssapi
make install
+ln -s /usr/include/tirpc/rpc /usr/include/rpc
+ln -s /usr/include/tirpc/netconfig.h /usr/include/netconfig.h
+ln -s /usr/lib/libtirpc.a /usr/lib/librpc.a
-termcap-1.3.1
+termcap-1.3.1:
./configure --prefix=/usr
make install
@@ -63,24 +57,26 @@ git clone http://github.com/vectorgraphics/asymptote
cd /usr/include
patch -p0 < ~/asymptote/patches/cygwin_glu.patch
-cd
-~/asymptote/build-scripts/build-freeglut
mkdir -p ~/dll/cygwin
cp /usr/bin/cygwin1.dll ~/dll/cygwin
+cd
+~/asymptote/build-scripts/build-freeglut
+
install texlive
mkdir ~/CTAN
-cp -a ~/asymptote/buildscripts/README-binaries ~/CTAN
+cp -a ~/asymptote/build-scripts/README-binaries ~/CTAN
GCVERSION=7.6.2
+wget http://hboehm.info/gc/gc_source/gc-$GCVERSION.tar.gz
+wget http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-$GCVERSION.tar.gz
tar -zxf gc-$GCVERSION.tar.gz
tar -zxf libatomic_ops-$GCVERSION.tar.gz
mv libatomic_ops-$GCVERSION gc-$GCVERSION/libatomic_ops
cd gc-$GCVERSION
-patch < ~/asymptote/patches/cygwin_gc.patch
+patch -p1 < ~/asymptote/patches/cygwin_gc.patch
./configure --disable-shared
make check
-VERSION=2.42
-~/asymptote/build-scripts/build-asymptote.dos $VERSION
+~/asymptote/build-scripts/build-asymptote.dos 2.43
diff --git a/Build/source/utils/asymptote/build-scripts/build-asymptote b/Build/source/utils/asymptote/build-scripts/build-asymptote
index 75ab3f46392..4239babd6bc 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asymptote
+++ b/Build/source/utils/asymptote/build-scripts/build-asymptote
@@ -67,8 +67,8 @@ cp -a /usr/local/share/info/asymptote/asymptote.info $SHARED/asydoc/png
cp -a /usr/local/share/info/asy-faq.info $SHARED/asydoc/FAQ
cd $BUILD
tar cfz $SRC asymptote-$VERSION
-tar cfz asymptote-$VERSION.i386.tgz $BINDIR
+tar cfz asymptote-$VERSION.x86_64.tgz $BINDIR
cp $SRC $SHARED
rm -rf $BUILD/$BINDIR
-tar -zxf asymptote-$VERSION.i386.tgz
+tar -zxf asymptote-$VERSION.x86_64.tgz
su rpmbuild -c "rpmbuild -ta --nodeps $SRC && rm -rf ~/rpms/BUILD/asymptote-$VERSION"
diff --git a/Build/source/utils/asymptote/build-scripts/build-asymptote.dos b/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
index 376e0da0558..3da86ae8ffb 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
+++ b/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
@@ -1,6 +1,12 @@
#!/bin/sh -x
GC=7.6.2
+MACHINE=`uname -m`
+if [ $MACHINE == i686 ]; then
+BINDIR=i386-windows
+else
+BINDIR=x86_64-windows
+fi
SHARED=~/shared/asy
MAKEFLAGS=-j8
export MAKEFLAGS
@@ -19,7 +25,7 @@ mkdir -p CTAN
rm -rf CTAN/asymptote-$VERSION
tar -zxf $SHARED/asymptote-$VERSION.src.tgz -C CTAN
tar -zxf $SHARED/asymptote-$VERSION.src.tgz
-mkdir -p CTAN/asymptote-$VERSION/binaries/i386-win32/texlive
+mkdir -p CTAN/asymptote-$VERSION/binaries/$BINDIR/texlive
cd asymptote-$VERSION
fi
BUILD=build-$VERSION
@@ -30,7 +36,7 @@ rm -rf $BUILD
mkdir -p $BUILD
cp -a $HOME/dll/cygwin/*.dll $HOME/dll/*.dll $BUILD
chmod 0644 $BUILD/*.dll
-cp -a $BUILD/*.dll ~/CTAN/asymptote-$VERSION/binaries/i386-win32/
+cp -a $BUILD/*.dll ~/CTAN/asymptote-$VERSION/binaries/$BINDIR/
cp -a $HOME/dll/*.dll .
make MSDOS=1 DESTDIR="$BUILD/" docdir="$BUILD/"
test -f asy.list || make MSDOS=1 keywords DESTDIR="$BUILD/" docdir="$BUILD/"
@@ -50,9 +56,16 @@ ls -p1 $BUILD \
| awk '{ if(index($0,"/")==length($0)) print "RMDir /r $INSTDIR\\" substr($0,0,length($0)-1); else print "Delete $INSTDIR\\" $0 }' \
> AsymptoteUninstallList.nsi
+if [ $MACHINE == i686 ]; then
+sed asymptote.nsi -e 's/$PROGRAMFILES64/$PROGRAMFILES/g' > asymptote32.nsi
+/cygdrive/c/Program\ Files\ \(x86\)/NSIS/makensis.exe asymptote32.nsi
+SUFFIX=-i386
+else
/cygdrive/c/Program\ Files\ \(x86\)/NSIS/makensis.exe asymptote.nsi
-cp -a --no-preserve=mode asymptote-$VERSION-setup.exe $SHARED
-mv asymptote-$VERSION-setup.exe ~/
+SUFFIX=
+fi
+cp -a --no-preserve=mode asymptote-$VERSION-setup.exe $SHARED/asymptote-$VERSION-setup$SUFFIX.exe
+mv asymptote-$VERSION-setup.exe ~/asymptote-$VERSION-setup$SUFFIX.exe
cd ~/
rm -rf asymptote-${VERSION}TL || exit
@@ -67,12 +80,19 @@ rm -f doc/*.aux doc/*.log doc/*.dvi
make MSDOS=1 DESTDIR="$BUILD/"
make MSDOS=1 install-asy DESTDIR="$BUILD/"
mv $BUILD/usr/local/bin/asy.exe $BUILD
-cp $BUILD/asy.exe ~/CTAN/asymptote-$VERSION/binaries/i386-win32/texlive
+cp $BUILD/asy.exe ~/CTAN/asymptote-$VERSION/binaries/$BINDIR/texlive
cp -a configure.ac ~/CTAN/asymptote-$VERSION/
cp -a $SHARED/asydoc/* ~/CTAN/asymptote-$VERSION/doc
-cd ~/CTAN/asymptote-$VERSION/binaries/i386-win32
-ln -sf ../../README .
+cd ~/CTAN/asymptote-$VERSION/binaries/$BINDIR
+cp -a ../../README .
cd ~/CTAN
-cp -a ~/asymptote/build-scripts/README-binaries asymptote-$VERSION/binaries/i386-win32/texlive/README
+cp -a ~/asymptote/build-scripts/README-binaries asymptote-$VERSION/binaries/$BINDIR/texlive/README
+SHAREDBIN=$SHARED/CTAN/asymptote-$VERSION
+if [ $MACHINE == i686 ]; then
+mkdir -p $SHAREDBIN
+cp -a asymptote-$VERSION/binaries/$BINDIR $SHAREDBIN
+else
+cp -a $SHAREDBIN/i386-windows ~/CTAN/asymptote-$VERSION/binaries
+fi
tar cfz asymptote-$VERSION-CTAN.tgz asymptote-$VERSION
cp -a --no-preserve=mode asymptote-$VERSION-CTAN.tgz $SHARED