Move the bpk files into a subdirectory and install them

diff --git a/Build b/Build
index fff39a950ec39d84d72f8224968026b90ed8eed1..5e50e8ffd56aeaf0ebcc37386ae0dad9dd7884c8 100644 (file)
--- a/Build
+++ b/Build
@@ -26,4 +26,9 @@ package "builder"
        {
                source "builderrc";
        };
+
+       install "share/builder/packages"
+       {
+               source "packages";
+       };
 };

diff --git a/devil.bpk b/devil.bpk
deleted file mode 100644 (file)
index b05a8d7..0000000
--- a/devil.bpk
+++ /dev/null
@@ -1,21 +0,0 @@
-binary_package "devil"
-{
-       // XXX DevIL has a .pc file for *nix but not for Windows
-       if_arch "!windows"
-       {
-               build_info
-               {
-                       library "IL";
-               };
-       };
-
-       if_arch "windows"
-       {
-               build_info
-               {
-                       library "DevIL";
-               };
-       };
-
-       header "IL/il.h";
-};

diff --git a/gmpxx.bpk b/gmpxx.bpk
deleted file mode 100644 (file)
index da2d851..0000000
--- a/gmpxx.bpk
+++ /dev/null
@@ -1,8 +0,0 @@
-binary_package "gmpxx"
-{
-       build_info
-       {
-               library "gmpxx";
-       };
-       header "gmpxx.h";
-};

diff --git a/openal.bpk b/openal.bpk
deleted file mode 100644 (file)
index 07e17e2..0000000
--- a/openal.bpk
+++ /dev/null
@@ -1,29 +0,0 @@
-binary_package "openal"
-{
-       // XXX OpenAL has a .pc file for *nix but not for Windows
-       if_arch "!windows & !darwin"
-       {
-               build_info
-               {
-                       library "openal";
-               };
-       };
-
-       if_arch "windows"
-       {
-               build_info
-               {
-                       library "OpenAL32";
-               };
-       };
-
-       if_arch "darwin"
-       {
-               build_info
-               {
-                       library "OpenAL.framework";
-               };
-       };
-
-       header "AL/al.h";
-};

diff --git a/opengl.bpk b/opengl.bpk
deleted file mode 100644 (file)
index c217cd5..0000000
--- a/opengl.bpk
+++ /dev/null
@@ -1,28 +0,0 @@
-binary_package "opengl"
-{
-       if_arch "!windows & !darwin"
-       {
-               build_info
-               {
-                       library "GL";
-               };
-       };
-
-       if_arch "windows"
-       {
-               build_info
-               {
-                       library "opengl32";
-               };
-       };
-
-       if_arch "darwin"
-       {
-               build_info
-               {
-                       library "OpenGL.framework";
-               };
-       };
-
-       header "GL/gl.h";
-};

diff --git a/opengles.bpk b/opengles.bpk
deleted file mode 100644 (file)
index dbba2b9..0000000
--- a/opengles.bpk
+++ /dev/null
@@ -1,10 +0,0 @@
-binary_package "opengles"
-{
-       build_info
-       {
-               library "GLESv2";
-               library "EGL";
-       };
-       header "GLES2/gl2.h";
-       header "EGL/egl.h";
-};

diff --git a/packages/devil.bpk b/packages/devil.bpk
new file mode 100644 (file)
index 0000000..b05a8d7
--- /dev/null
+++ b/packages/devil.bpk
@@ -0,0 +1,21 @@
+binary_package "devil"
+{
+       // XXX DevIL has a .pc file for *nix but not for Windows
+       if_arch "!windows"
+       {
+               build_info
+               {
+                       library "IL";
+               };
+       };
+
+       if_arch "windows"
+       {
+               build_info
+               {
+                       library "DevIL";
+               };
+       };
+
+       header "IL/il.h";
+};

diff --git a/packages/gmpxx.bpk b/packages/gmpxx.bpk
new file mode 100644 (file)
index 0000000..da2d851
--- /dev/null
+++ b/packages/gmpxx.bpk
@@ -0,0 +1,8 @@
+binary_package "gmpxx"
+{
+       build_info
+       {
+               library "gmpxx";
+       };
+       header "gmpxx.h";
+};

diff --git a/packages/openal.bpk b/packages/openal.bpk
new file mode 100644 (file)
index 0000000..07e17e2
--- /dev/null
+++ b/packages/openal.bpk
@@ -0,0 +1,29 @@
+binary_package "openal"
+{
+       // XXX OpenAL has a .pc file for *nix but not for Windows
+       if_arch "!windows & !darwin"
+       {
+               build_info
+               {
+                       library "openal";
+               };
+       };
+
+       if_arch "windows"
+       {
+               build_info
+               {
+                       library "OpenAL32";
+               };
+       };
+
+       if_arch "darwin"
+       {
+               build_info
+               {
+                       library "OpenAL.framework";
+               };
+       };
+
+       header "AL/al.h";
+};

diff --git a/packages/opengl.bpk b/packages/opengl.bpk
new file mode 100644 (file)
index 0000000..c217cd5
--- /dev/null
+++ b/packages/opengl.bpk
@@ -0,0 +1,28 @@
+binary_package "opengl"
+{
+       if_arch "!windows & !darwin"
+       {
+               build_info
+               {
+                       library "GL";
+               };
+       };
+
+       if_arch "windows"
+       {
+               build_info
+               {
+                       library "opengl32";
+               };
+       };
+
+       if_arch "darwin"
+       {
+               build_info
+               {
+                       library "OpenGL.framework";
+               };
+       };
+
+       header "GL/gl.h";
+};

diff --git a/packages/opengles.bpk b/packages/opengles.bpk
new file mode 100644 (file)
index 0000000..dbba2b9
--- /dev/null
+++ b/packages/opengles.bpk
@@ -0,0 +1,10 @@
+binary_package "opengles"
+{
+       build_info
+       {
+               library "GLESv2";
+               library "EGL";
+       };
+       header "GLES2/gl2.h";
+       header "EGL/egl.h";
+};

diff --git a/packages/xlib.bpk b/packages/xlib.bpk
new file mode 100644 (file)
index 0000000..0618322
--- /dev/null
+++ b/packages/xlib.bpk
@@ -0,0 +1,8 @@
+binary_package "xlib"
+{
+       build_info
+       {
+               library "X11";
+       };
+       header "X11/Xlib.h";
+};

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 0ce2bdc4ababa4a259820e0097e1214789df250c..7482aced39c9923a51083eb3d71b6cd2483956b4 100644 (file)
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -144,7 +144,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 
        package_manager.append_package_path(cwd);
        package_manager.append_package_path(cwd/"..");
-       package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
+       package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder")/"packages");
 
        package_manager.set_no_externals(no_externals);
 

diff --git a/xlib.bpk b/xlib.bpk
deleted file mode 100644 (file)
index 0618322..0000000
--- a/xlib.bpk
+++ /dev/null
@@ -1,8 +0,0 @@
-binary_package "xlib"
-{
-       build_info
-       {
-               library "X11";
-       };
-       header "X11/Xlib.h";
-};