Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

converted to OTP base until the next Sinan is out

I need to do testing with R12B-1 and Since faxien is not there yet
I am using OTP base. Once the new Sinan is out I will convert back.
  • Loading branch information...
commit cb530837b64dc4e88141a846996b12ce0c5f013f 1 parent 6175269
Martin Logan authored
View
21 LICENCE
@@ -1,9 +1,20 @@
-The MIT License
+Tue Oct 24 12:28:44 CDT 2006
-Copyright © 2006, 2007 Erlware, Martin Logan, Eric Merritt
+Copyright (c) <2006> <Martin J. Logan, Erlware>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the .Software.), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software (OTP Base, fslib, G.A.S) and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED .AS IS., WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
71 README
@@ -1,9 +1,64 @@
-1. Installation of Faxien
- - download faxien_launcher
- - run ./faxien_launcher -b -r http://repo.erlware.org
- - Optionally if you don't want to install Faxien into the default location which is /usr/local/erlware you can use:
- ./faxien_launcher -b -r http://repo.erlware.org --prefix <some_path> which will install into <some_path>/erlware
-
-2. to see a list of commands Faxien understands run /usr/local/erlware/bin/faxien help
-3. alternatively you may add erlware/bin to your path and then just run faxien.
+Much more information on these topics can be found at www.erlware.org
+
+Downloading Dependencies
+========================
+
+OTP Base requires a few erlang packages in order to run correctly. To get these applications we use Erlware Faxien which can be downloaded from 'http://code.google.com/p/faxien' and use it to install the required packages.
+
+1. Bootstrap Faxien with the appropriate bootstrapper from the download site.
+
+2. Use 'faxien install' to install the erl release which provides the Erlang shell and the erlc compiler.
+ - 'sudo /usr/local/erlware/bin/faxien install erl'
+
+3. Install the following apps with 'faxien install-app'.
+ - 'sudo /usr/local/erlware/bin/faxien install-app fslib'
+ - 'sudo /usr/local/erlware/bin/faxien install-app gas'
+ - 'sudo /usr/local/erlware/bin/faxien install-app eunit'
+ *Tip* The Faxien release itself uses all the apps listed above so instead of installing them all separately you can save time by simply using the upgrade command to upgrade the existing versions to the latest greatest. Do this as follows: 'sudo /usr/local/erlware/bin/faxien upgrade-all-apps'
+
+at this point you should be ready to go.
+
+Building the tree
+=================
+
+To build, type make, it should all work from there. Applications are built under the 'lib' dir and releases under the 'release' directory.
+
+Creating a new application
+==========================
+
+A new application can be created by using the tools/application_generation utility.
+This utility will create a basic OTP application framework under the lib directory
+
+usage: application_generation <app-name> <prefix>
+
+Appname is the name of the application that you would like to create. The prefix is
+usually the first letter of each word in the appname. This prefix is to avoid name
+clashes between applications included in a release (Erlang does not have packages).
+
+example usage: application_generation my_app ma
+
+which results in
+
+lib/my_app
+
+Creating a new release
+======================
+
+A release is the OTP packaging structure that binds together a number of applications, configuration, and startup scripts to create a standalone Erlang service. To create a new release from which to run your application(s) you can use the tools/release_generation script.
+
+usage: release_generation <release-name>
+example usage: release_generation test
+
+The example above will create a release called test under release/test
+
+Running a release
+=================
+
+Your release should contain all that you need to run your application. You have only to edit your .rel.src file to add to it the applications you have developed over in the lib side. If your application depends on any applications that are supplied outside of your otp-base build tree you can always install them with faxien and then add them to your .rel.src file as well.
+
+To run a release there are two options: The first is local. A local version can be found in the release/<release-name>/local directory which is added by the make process. This should be used during development to run your release interactively via an Erlang shell. To run a release in local mode cd into the "local" directory and run <release-name>.sh.
+
+In the case where you want to create a production ready release on one machine and then deploy it on multiple identical machines you may create a production package with 'make pacakge'. To do this run 'make package' from the release/<release-name> directory. This will create a directory '<release-name>-<release-vsn>. This this directory can be tarred up and the tar can be shipped to its destination and installed with faxien. This directory may also be published to a repo for remote installation on another box via faxien. See the docs for faxien at erlware.org for more details on this.
+
+
View
10 _build.cfg
@@ -1,10 +0,0 @@
-project : {
- name : faxien
- vsn : "0.28.3.1"
-},
-
-repositories : ["http://repo.martinjlogan.com/pub", "http://repo.erlware.org/pub"],
-
-dist : {
- include_dirs : ["bin"]
-}
View
21 bin/epkg
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-#PREFIX=$(cd $(dirname $0)/%BACKUP%; pwd)
-PREFIX=$(cd $(dirname $0)/..; pwd)
-
-#### Fill in values for these variables ####
-REL_NAME=faxien
-REL_VSN=0.28.3.0
-ERTS_VSN=5.5.5
-INVOCATION_SUFFIX="-s epkg_cmdln epkg_apply epkg $@ -s init stop -noshell -prefix $PREFIX"
-###########################################
-
-export ROOTDIR=$PREFIX/application_packages/$ERTS_VSN
-export BINDIR=$PREFIX/erts_packages/erts-$ERTS_VSN/bin
-export EMU=beam
-export PROGNAME=erl
-export LD_LIBRARY_PATH=$PREFIX/erts/$ERTS_VSN/lib
-
-REL_DIR=$PREFIX/release_packages/$REL_NAME-$REL_VSN/release
-
-$BINDIR/erlexec -config $REL_DIR/sys.config -boot $REL_DIR/$REL_NAME $INVOCATION_SUFFIX
View
21 bin/faxien
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-#PREFIX=$(cd $(dirname $0)/%BACKUP%; pwd)
-PREFIX=$(cd $(dirname $0)/..; pwd)
-
-#### Fill in values for these variables ####
-REL_NAME=faxien
-REL_VSN=0.28.3.1
-ERTS_VSN=5.5.5
-INVOCATION_SUFFIX="-s fax_cmdln faxien_apply faxien $@ -s init stop -noshell -prefix $PREFIX"
-###########################################
-
-export ROOTDIR=$PREFIX/application_packages/$ERTS_VSN
-export BINDIR=$PREFIX/erts_packages/erts-$ERTS_VSN/bin
-export EMU=beam
-export PROGNAME=erl
-export LD_LIBRARY_PATH=$PREFIX/erts/$ERTS_VSN/lib
-
-REL_DIR=$PREFIX/release_packages/$REL_NAME-$REL_VSN/release
-
-$BINDIR/erlexec -config $REL_DIR/sys.config -boot $REL_DIR/$REL_NAME $INVOCATION_SUFFIX
View
31 config/sys.config
@@ -1,31 +0,0 @@
-[
- {sasl, [{sasl_error_logger, {file, "/tmp/faxien.sasl_log"}}]},
-
- {gas,
- [
- {mod_specs, [{elwrap, {ewl_elwrap_h, start_link}}]},
-
- % elwrap config.
- {err_log, "/tmp/faxien.err_log"},
- {err_log_wrap_info, {{err,5000000,10},{sasl,5000000,10}}},
- {err_log_tty, false}
- ]
- },
-
- {epkg,
- [
- {target_erts_vsn, "5.5.5"},
- {is_local_boot, false}
- ]
- },
-
- {faxien,
- [
- {repos_to_fetch_from, ["http://repo.erlware.org/pub", "http://repo.martinjlogan.com/pub"]},
- {repos_to_publish_to, ["http://repo.erlware.org/writable", "http://repo.martinjlogan.com/pub"]},
- {request_timeout, 35000},
- {is_local_boot, false}
- ]
- }
-].
-
View
15 control
@@ -1,15 +0,0 @@
-{control,"faxien",
- [{package_owner,"Martin Logan"},
- {package_owner_email,"martinjlogan@erlware.org"},
- {categories,["tool"]},
- {description,"The package manager for Erlang OTP"},
- {author,"Martin Logan"},
- {authors_email,"martinjlogan@erlware.org"},
- {keywords,["faxien",
- "erlware",
- "OTP",
- "package management",
- "package",
- "manager"]},
- {project_page,"http://www.erlware.org/tools/faxien/index.html"}]}.
-
View
46 install.sh
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# This file is meant to run in the base directory of the faxien package. It is not meant for development.
-
-PREFIX="/usr/local/erlware"
-if [ "$1" != "" ]; then
-PREFIX="$1"
-fi
-
-if [ "$1" = "help" ] || [ "$1" = "--help" ];then
- echo "just run install with no arguments to install to the default location"
- echo "or run install <path> to install in a non standard location"
- exit 0
-fi
-
-# Follow symlinks to the binary
-echo $1 | sed -e 's;--;;' | grep -e 'prefix=.*' > /dev/null
-if [ "$?" = "0" ];then
- echo "$0 Error: use --prefix without an equals sign"
- exit 1
-fi
-
-PROG_NAME="$0"
-BASE_DIR=`dirname $PROG_NAME`
-cd $BASE_DIR
-BASE_DIR=`pwd`
-cd -
-CONFIG_FILE=`ls $BASE_DIR/releases/*/sys.config 2> /dev/null`
-FAX_DIR=$(dirname `ls $BASE_DIR/lib/faxien*/ebin/faxien.app 2> /dev/null`)
-uname | grep CYGWIN
-
-if [ "$?" = "0" ];then
- CONFIG_FILE=`echo $CONFIG_FILE | sed -e 's;\/cygdrive\/.;;'`
- FAX_DIR=`echo $FAX_DIR | sed -e 's;\/cygdrive\/.;;'`
- BASE_DIR=`echo $BASE_DIR | sed -e 's;\/cygdrive\/.;;'`
-fi
-
-WILDCARD_DIRS="[\"$BASE_DIR/lib/*\"]"
-echo "PROG_NAME: $PROG_NAME"
-echo "BASE_DIR: $BASE_DIR"
-echo "FAX_DIR: $FAX_DIR"
-echo "CONFIG_FILE $CONFIG_FILE"
-echo "WILDCARD_DIRS $WILDCARD_DIRS"
-
-
-erl -pz $FAX_DIR -config $CONFIG_FILE -s fax_cmdln faxien_apply application load faxien -s fax_cmdln faxien_apply fax_util add_pzs $WILDCARD_DIRS -s ibrowse start -s fax_cmdln faxien_apply faxien install $BASE_DIR -s init stop -noshell -prefix $PREFIX
View
40 lib/epkg/ebin/epkg.app
@@ -1,16 +1,26 @@
-{application, epkg,
- [{description, "Manages local erlang/OTP packages. Faxien depends on this for local operations."},
- {vsn, "0.3.2.0"},
- {modules, [
- epkg,
- epkg_cmdln,
- epkg_installed_paths,
- epkg_install,
- epkg_manage,
- epkg_package_paths,
- epkg_util,
- epkg_validation
- ]},
+%%% -*- mode:erlang -*-
+{application, 'epkg',
+ [
+ % A quick description of the application.
+ {description, "Manages local erlang/OTP packages. Faxien depends on this for local operations."},
+
+ % The version of the applicaton
+ {vsn, "0.3.2.1"},
+
+ % All modules used by the application.
+ {modules,
+ [
+ ]},
+
+ % A list of the registered processes in your application. Used to prevent collisions.
{registered, []},
- {versioned_dependencies, []},
- {applications, [eunit, kernel, stdlib, ewrepo, ewlib, gas, fslib]}]}.
+
+ % The applications this app depends on in order to run.
+ {applications, [eunit, kernel, stdlib, ewrepo, ewlib, gas, fslib]},
+
+ % configuration parameters similar to those in the config file specified
+ % on the command line. can be fetched with gas:get_env
+ {env, []}
+ ]
+}.
+
View
0  lib/epkg/include/epkg.hrl 100644 → 100755
File mode changed
View
2  lib/epkg/src/epkg_installed_paths.erl
@@ -308,7 +308,7 @@ installed_config_file_path() ->
config_file_path(InstallationPath) ->
%% @todo this is not compatible with composable apps - this must run with faxien. Fix this.
{ok, Version} = faxien:version(),
- lists:flatten([installed_release_file_dir(InstallationPath, "faxien", Version), "sys.config"]).
+ lists:flatten([installed_release_file_dir(InstallationPath, "faxien", Version), "faxien.config"]).
installed_release_file_dir(InstallationPath, RelName, RelVsn) ->
View
40 lib/faxien/ebin/faxien.app
@@ -1,15 +1,27 @@
-{application, faxien,
- [{description, "The erlang package management tool."},
- {vsn, "0.28.3.1"},
- {modules, [
- faxien,
- fax_publish,
- fax_put,
- fax_install,
- fax_manage,
- fax_cmdln,
- fax_util
- ]},
+%%% -*- mode:erlang -*-
+{application, 'faxien',
+ [
+ % A quick description of the application.
+ {description, "The erlang package management tool."},
+
+ % The version of the applicaton
+ {vsn, "0.28.4.2"},
+
+ % All modules used by the application.
+ {modules,
+ [
+ ]},
+
+ % A list of the registered processes in your application. Used to prevent collisions.
{registered, []},
- {versioned_dependencies, [{ibrowse, "1.2.4.1", gte}]},
- {applications, [eunit, kernel, stdlib, xmerl, ibrowse, epkg, ewrepo, ewlib, fslib, gas]}]}.
+
+ % This is a list of the applications that your application depends on. This list must be filled out
+ % carefully so that dependency resolution systems can function properly.
+ {applications, [eunit, kernel, stdlib, xmerl, ibrowse, epkg, ewrepo, ewlib, fslib, gas]},
+
+ % configuration parameters similar to those in the config file specified
+ % on the command line. can be fetched with gas:get_env
+ {env, []}
+ ]
+}.
+
View
0  lib/faxien/include/faxien.hrl 100644 → 100755
File mode changed
View
49 smoke_test.sh
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Thanks to Scott Parish for this tip. Halts the shell execution on
-# the failure of a simple command (see sh SHELL GRAMMER for more).
-set -e
-
-echo " Starting the Faxien/Epkg Smoke Test"
-echo "====================================="
-echo ""
-
-faxien search cos
-epkg list #| head -n 5
-
-echo "describe the sinan application at its latest version"
-faxien describe_app sinan #| head -n 5
-
-faxien remove sinan
-faxien install sinan 0.8.6
-
-faxien outdated_apps
-echo "upgrade the sinan app"
-faxien upgrade_app sinan
-
-faxien outdated
-echo "upgrade all installed releases"
-faxien upgrade_all
-
-echo "add and remove publish repos"
-faxien add_publish_repo http://test_publish_repo.com
-faxien show_publish_repos
-faxien remove_publish_repo http://test_publish_repo.com
-faxien show_publish_repos
-
-echo "add and remove repos"
-faxien add_repo http://testrepo.com
-faxien show_repos
-faxien remove_repo http://testrepo.com
-faxien show_repos
-
-echo "show request timeout"
-faxien show_request_timeout
-echo "update request timeout to 99999"
-faxien set_request_timeout 99999
-echo "show request altered timeout"
-faxien show_request_timeout
-
-echo "show faxien and epkg versions"
-faxien version
-epkg version
Please sign in to comment.
Something went wrong with that request. Please try again.