Skip to content

Commit

Permalink
Merge branch 'release/1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Tipton committed Feb 18, 2023
2 parents bcc7f60 + 41a6040 commit 0ffd2b4
Show file tree
Hide file tree
Showing 131 changed files with 1,871 additions and 14,752 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ nbproject
.settings
vendor
composer.phar
reviews*
build
public/google*
public/css
public/js
43 changes: 0 additions & 43 deletions Vagrantfile

This file was deleted.

78 changes: 78 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="WNR" basedir="." default="build">
<property name="build.dir" value="build" />
<property name="build.name" value="WNR" />
<property name="build.version" value="1.0" />
<property name="build.target" value="./${build.dir}/${build.name}-${build.version}" />
<property name="build.env" value="development" override="true" />

<target name="build:clean" description="Cleans up build artifacts">
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
<mkdir dir="${build.target}" />
</target>

<target name="build:composer">
<if>
<equals arg1="${build.env}" arg2="production" />
<then>
<composer composer="/usr/local/bin/composer" command="install">
<arg value="--working-dir" />
<arg path="." />
<arg value="--no-dev" />
</composer>
</then>
<else>
<composer composer="/usr/local/bin/composer" command="install">
<arg value="--working-dir" />
<arg path="." />
</composer>
</else>
</if>
</target>

<target name="build:files">
<copy todir="${build.target}">
<fileset dir=".">
<include name="**" />
<exclude name=".*" />
<exclude name="build.xml" />
<exclude name="composer.*" />
<exclude name="README.md" />
<exclude name="LICENSE.txt" />
<exclude name="build/**" />
</fileset>
</copy>

<copy todir="${build.target}/public">
<fileset dir="./vendor/foundation/foundation-sites/dist">
<include name="**" />
</fileset>
</copy>
</target>

<target name="deploy:clean">
<delete file="${build.target}.tar.gz" />
</target>

<target name="deploy:create-package">
<property name="build.dist" value="${build.target}.tar.gz" />

<echo>Creating dist package ${build.dist}</echo>

<tar destfile="${build.dist}" compression="gzip">
<fileset dir="${build.dir}">
<include name="${build.name}-${build.version}" />
</fileset>
</tar>
</target>

<target name="build" depends="build:clean, build:composer, build:files">
<echo>Build complete</echo>
</target>

<target name="deploy" depends="deploy:clean, deploy:create-package">
<echo>Deploy complete</echo>
</target>

</project>
13 changes: 10 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "tiptone/WNR",
"name": "tiptone/wnr",
"description": "Front end for the Whisky Review Archive",
"license": "BSD-3-Clause",
"keywords": [
Expand All @@ -8,7 +8,14 @@
],
"homepage": "http://whiskynetworkreviews.com/",
"require": {
"php": ">=5.5",
"zendframework/zendframework": "2.4"
"monolog/monolog": "^2.9",
"php-di/php-di": "^6.4",
"foundation/foundation-sites": "^6.7",
"twig/twig": "^3.5"
},
"autoload": {
"psr-4": {
"Tiptone\\Mvc\\": "src/"
}
}
}
Loading

0 comments on commit 0ffd2b4

Please sign in to comment.