diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages index 672b099568..bc0cd80b3b 100644 --- a/build/jam/HaikuPackages +++ b/build/jam/HaikuPackages @@ -1,3 +1,6 @@ +#pragma mark - haiku.hpkg + + local haikuPackage = haiku.hpkg ; HaikuPackage $(haikuPackage) ; @@ -298,3 +301,127 @@ CopyDirectoryToPackage documentation BuildHaikuPackage $(haikuPackage) : haiku ; + + +#pragma mark - haiku-devel.hpkg + + +local haikuDevelPackage = haiku-devel.hpkg ; +HaikuPackage $(haikuDevelPackage) ; + +local arch = $(TARGET_ARCH) ; +local developDirTokens = develop ; + +# glue code +AddFilesToPackage $(developDirTokens) lib : + crti.o + crtn.o + init_term_dyn.o + start_dyn.o + haiku_version_glue.o +; + +# kernel +AddFilesToPackage $(developDirTokens) lib : kernel.so : _KERNEL_ ; + +# additional libraries +local developmentLibs = libroot_debug.so ; +AddFilesToPackage lib : $(developmentLibs) ; + +# library symlinks +local lib ; +for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) { + AddSymlinkToPackage $(developDirTokens) lib : /system/lib $(lib:BS) ; + local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; + if $(abiVersion) { + local abiVersionedLib = $(lib:BS).$(abiVersion) ; + AddSymlinkToPackage $(developDirTokens) lib + : /system/lib $(abiVersionedLib) ; + } +} + +# static libraries +AddFilesToPackage $(developDirTokens) lib : libncurses.a ; +AddFilesToPackage $(developDirTokens) lib : liblocalestub.a ; + +# the POSIX error code mapper library +AddFilesToPackage $(developDirTokens) lib : libposix_error_mapper.a ; + +# ABI independent stuff + +# scripts: cc and c++ wrapper, freetype-config, setgcc +local scripts = cc c++ freetype-config setgcc ; +SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ; +AddFilesToPackage bin : $(scripts) ; + +# headers +AddHeaderDirectoryToPackage config ; +AddHeaderDirectoryToPackage glibc ; +AddHeaderDirectoryToPackage os ; +AddHeaderDirectoryToPackage posix ; + +# create be -> os symlink for now +AddSymlinkToPackage $(developDirTokens) headers : os : be ; + +# BSD and GNU compatibility headers +AddHeaderDirectoryToPackage compatibility bsd : bsd ; +AddHeaderDirectoryToPackage compatibility gnu : gnu ; + +# third party libs headers +AddHeaderDirectoryToPackage libs freetype2 : 3rdparty ; +AddHeaderDirectoryToPackage libs jpeg : 3rdparty ; +AddHeaderDirectoryToPackage libs ncurses : 3rdparty ; +AddHeaderDirectoryToPackage libs png : 3rdparty ; +AddHeaderDirectoryToPackage libs termcap : 3rdparty ; +AddHeaderDirectoryToPackage libs tiff : 3rdparty ; +AddHeaderDirectoryToPackage libs zlib : 3rdparty ; + +# cpp headers +if $(HAIKU_GCC_VERSION[1]) = 2 { + # GCC 2 only -- for GCC 4 they come with the DevelopmentBase package + CopyDirectoryToPackage $(developDirTokens) headers c++ + : [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ; +} + +BuildHaikuPackage $(haikuDevelPackage) : haiku-devel ; + + +#pragma mark - haiku-userguide.hpkg + + +local haikuUserGuidePackage = haiku-userguide.hpkg ; +HaikuPackage $(haikuUserGuidePackage) ; + +CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ] + : userguide : -x .svn ; + +BuildHaikuPackage $(haikuUserGuidePackage) : haiku-userguide ; + + +#pragma mark - haiku-welcome.hpkg + + +local haikuWelcomePackage = haiku-welcome.hpkg ; +HaikuPackage $(haikuWelcomePackage) ; + +CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ] + : welcome : -x .svn ; + +BuildHaikuPackage $(haikuWelcomePackage) : haiku-welcome ; + + +#pragma mark - makefile-engine.hpkg + + +local makefileEnginePackage = makefile-engine.hpkg ; +HaikuPackage $(makefileEnginePackage) ; + +# skeleton makefile and makefile-engine +local makefileEngineFiles = + makefile + makefile-engine +; +SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ; +AddFilesToPackage develop etc : $(makefileEngineFiles) ; + +BuildHaikuPackage $(makefileEnginePackage) : makefile-engine ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index a1ccbb7648..1e940c0c07 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -204,9 +204,9 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { # BeBook if [ IsOptionalHaikuImagePackageAdded BeBook ] { - InstallOptionalHaikuImagePackage bebook_20081026.zip - : $(baseURL)/bebook_20081026.zip - : system documentation ; + InstallOptionalHaikuImagePackage bebook-2008-10-26-1.hpkg + : $(hpkgBaseURL)/bebook-2008-10-26-1.hpkg + : system packages ; AddSymlinkToHaikuImage home Desktop : /boot/system/documentation/bebook/index.html : BeBook ; @@ -602,90 +602,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { $(HAIKU_GCC_VERSION[1]) ; } - local arch = $(TARGET_ARCH) ; - local developDirTokens = system develop ; - - # glue code - AddFilesToHaikuImage $(developDirTokens) lib : - crti.o - crtn.o - init_term_dyn.o - start_dyn.o - haiku_version_glue.o - ; - - # kernel - AddFilesToHaikuImage $(developDirTokens) lib : kernel.so : _KERNEL_ ; - - # additional libraries - local developmentLibs = libroot_debug.so ; - AddFilesToHaikuImage system lib : $(developmentLibs) ; - - # library symlinks - local lib ; - for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) { - AddSymlinkToHaikuImage $(developDirTokens) lib - : /system/lib $(lib:BS) ; - local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; - if $(abiVersion) { - local abiVersionedLib = $(lib:BS).$(abiVersion) ; - AddSymlinkToHaikuImage $(developDirTokens) lib - : /system/lib $(abiVersionedLib) ; - } - } - - # static libraries - AddFilesToHaikuImage $(developDirTokens) lib : libncurses.a ; - AddFilesToHaikuImage $(developDirTokens) lib : liblocalestub.a ; - - # the POSIX error code mapper library - AddFilesToHaikuImage $(developDirTokens) lib : libposix_error_mapper.a ; - - # ABI independent stuff - - # scripts: cc and c++ wrapper, freetype-config, setgcc - local scripts = cc c++ freetype-config setgcc ; - SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ; - AddFilesToHaikuImage system bin : $(scripts) ; - - # skeleton makefile and makefile-engine - local makefileEngineFiles = - makefile - makefile-engine - ; - SEARCH on $(makefileEngineFiles) - = [ FDirName $(HAIKU_TOP) data develop ] ; - AddFilesToHaikuImage common develop etc - : $(makefileEngineFiles) ; - - # headers - AddHeaderDirectoryToHaikuImage config ; - AddHeaderDirectoryToHaikuImage glibc ; - AddHeaderDirectoryToHaikuImage os ; - AddHeaderDirectoryToHaikuImage posix ; - - # create be -> os symlink for now - AddSymlinkToHaikuImage $(developDirTokens) headers : os : be ; - - # BSD and GNU compatibility headers - AddHeaderDirectoryToHaikuImage compatibility bsd : bsd ; - AddHeaderDirectoryToHaikuImage compatibility gnu : gnu ; - - # third party libs headers - AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs jpeg : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs termcap : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs tiff : 3rdparty ; - AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; - - # cpp headers - if $(HAIKU_GCC_VERSION[1]) = 2 { - # GCC 2 only -- for GCC 4 they come with the DevelopmentBase package - CopyDirectoryToHaikuImage $(developDirTokens) headers c++ - : [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ; - } + AddFilesToHaikuImage system packages : haiku-devel.hpkg ; + AddFilesToHaikuImage common packages : makefile-engine.hpkg ; } @@ -1492,8 +1410,8 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] { # TimGMSoundFont if [ IsOptionalHaikuImagePackageAdded TimGMSoundFont ] { - InstallOptionalHaikuImagePackage TimGMSoundFont-2010-06-16.zip - : $(baseURL)/TimGMSoundFont-2010-06-16.zip ; + InstallOptionalHaikuImagePackage TimGMSoundFont-2010-06-16.hpkg + : $(hpkgBaseURL)/TimGMSoundFont-2010-06-16.hpkg ; } @@ -1637,12 +1555,9 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { # Welcome if [ IsOptionalHaikuImagePackageAdded Welcome ] { - CopyDirectoryToHaikuImage system documentation - : [ FDirName $(HAIKU_TOP) docs welcome ] - : welcome : -x .svn ; - CopyDirectoryToHaikuImage system documentation - : [ FDirName $(HAIKU_TOP) docs userguide ] - : userguide : -x .svn ; + AddFilesToHaikuImage system packages : haiku-userguide.hpkg ; + AddFilesToHaikuImage system packages : haiku-welcome.hpkg ; + AddSymlinkToHaikuImage home Desktop : /boot/system/documentation/welcome/welcome_en.html : Welcome ; diff --git a/src/data/package_infos/haiku-devel b/src/data/package_infos/haiku-devel new file mode 100644 index 0000000000..b3b5b8e3a0 --- /dev/null +++ b/src/data/package_infos/haiku-devel @@ -0,0 +1,21 @@ +name = haiku-devel +version = 1-1 +architecture = x86_gcc2 +summary = "The Haiku base system development files" +description = "The package contains all files associated with the base system +needed for development, like static libraries, glue code, library symlinks, +header files, etc." + +packager = "The Haiku build system" +vendor = "Haiku Project" + +copyright = "2001-2011 Haiku, Inc. et al" +licenses = [ "MIT" ] + +provides = [ + haiku-devel +] + +requires = [ + haiku +] diff --git a/src/data/package_infos/haiku-userguide b/src/data/package_infos/haiku-userguide new file mode 100644 index 0000000000..6a24f6c236 --- /dev/null +++ b/src/data/package_infos/haiku-userguide @@ -0,0 +1,18 @@ +name = haiku-userguide +version = 1-1 +architecture = any +summary = "The Haiku user documentation" +description = "The Haiku user documentation." + +packager = "The Haiku build system" +vendor = "Haiku Project" + +copyright = "2001-2011 Haiku, Inc. et al" +licenses = [ "MIT" ] + +provides = [ + haiku-welcome +] + +requires = [ +] diff --git a/src/data/package_infos/haiku-welcome b/src/data/package_infos/haiku-welcome new file mode 100644 index 0000000000..23fcf51329 --- /dev/null +++ b/src/data/package_infos/haiku-welcome @@ -0,0 +1,18 @@ +name = haiku-welcome +version = 1-1 +architecture = any +summary = "The Haiku welcome documentation" +description = "The Haiku welcome documentation for new users." + +packager = "The Haiku build system" +vendor = "Haiku Project" + +copyright = "2001-2011 Haiku, Inc. et al" +licenses = [ "MIT" ] + +provides = [ + haiku-welcome +] + +requires = [ +] diff --git a/src/data/package_infos/makefile-engine b/src/data/package_infos/makefile-engine new file mode 100644 index 0000000000..ac2c65f3bd --- /dev/null +++ b/src/data/package_infos/makefile-engine @@ -0,0 +1,19 @@ +name = makefile-engine +version = 1-1 +architecture = any +summary = "The makefile engine" +description = "A simple generic makefile engine and makefile template." + +packager = "The Haiku build system" +vendor = "Be Inc., Haiku Project" + +copyright = "? Be Inc. 2001-2011 Haiku, Inc." +licenses = [ "MIT" ] + +provides = [ + makefile-engine +] + +requires = [ + cmd:make +]