Commit c503930b authored by Cris Bailiff's avatar Cris Bailiff
Browse files

Added Solaris 'pkgadd' building support to packages collection and autoconf/automake files

parent 5c6859e5

Makefile.am

+15 −0
Original line number Diff line number Diff line
@@ -48,3 +48,18 @@ rpm: 
	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \

	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \

	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .



#

# Build a Solaris pkkgadd format file

# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format

# file (which ends up back in this directory).

# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do

# pkgadd -d ./HAXXcurl-*

#



# gak - libtool requires an absoulte directory, hence the pwd below...

pkgadd:

	umask 022 ; \

	make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \

	cat LEGAL MITX.txt MPL-1.1.txt > $(srcdir)/packages/Solaris/copyright ; \

	cd $(srcdir)/packages/Solaris && $(MAKE) package

configure.in

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ dnl we extract the numerical version for curl-config only 
VERSIONNUM=`sed -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curl.h`

AC_SUBST(VERSIONNUM)



dnl Solaris pkgadd support definitions

PKGADD_PKG="HAXXcurl"

PKGADD_NAME="cURL - a client that groks URLs"

PKGADD_VENDOR="curl.haxx.se"

AC_SUBST(PKGADD_PKG)

AC_SUBST(PKGADD_NAME)

AC_SUBST(PKGADD_VENDOR)





dnl

dnl Detect the canonical host and target build environment

dnl
@@ -831,6 +840,7 @@ AC_CONFIG_FILES([Makefile \ 
	   packages/Linux/RPM/Makefile \

	   packages/Linux/RPM/curl.spec \

	   packages/Linux/RPM/curl-ssl.spec \

           packages/Solaris/Makefile \

           perl/Makefile \

           perl/Curl_easy/Makefile \

           php/Makefile \

packages/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS = Win32 Linux

SUBDIRS = Win32 Linux Solaris



EXTRA_DIST = README

packages/Solaris/Makefile.am

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#

# $Id$

#



PKGADD_PKG="@PKGADD_PKG@"

PKGADD_NAME="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"

PKGADD_VENDOR="@PKGADD_VENDOR@"

PKGADD_ARCH="@host_cpu@"

PKGADD_DESC="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"

PKGADD_CLASSES=none

PKGADD_BASEDIR=/



PKGADD_FILE=${PKGADD_PKG}-@PACKAGE@-@VERSION@-@host@.pkg



package:

	if [ ! -f release ]; then echo 0 > release; fi

	if [ `find root -newer release -print|wc -l` -gt 0 ]; then expr `cat release` + 1 > release; fi

	echo PKG=${PKGADD_PKG} > pkginfo

	echo NAME=${PKGADD_NAME} >> pkginfo

	echo VENDOR=${PKGADD_VENDOR} >> pkginfo

	echo ARCH=${PKGADD_ARCH} >> pkginfo

	echo DESC=${PKGADD_DESC} >> pkginfo

	echo CLASSES=${PKGADD_CLASSES} >> pkginfo

	echo BASEDIR=${PKGADD_BASEDIR} >> pkginfo

	echo CATEGORY=application >> pkginfo

	echo VERSION=`cat ./release` >> pkginfo

	echo > prototype

	for subdir in opt var etc usr; \

	do if [ -d root/$$subdir ]; then \

		pkgproto root/$$subdir=$$subdir >> prototype;\

	fi; done

	for file in pkginfo preinstall postinstall copyright; \

	do if [ -f $$file ]; then \

		echo "i $$file=$$file" >> prototype; \

	fi; done

	rm -rf ./tmp

	mkdir ./tmp

	pkgmk -o -d ./tmp

	pkgtrans -so ./tmp ${top_srcdir}/../${PKGADD_FILE} ${PKGADD_PKG}