Skip to content

Commit

Permalink
Moved pkg to rel-pkg for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
Licenser committed Feb 28, 2015
1 parent 807abde commit 1251490
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ target/
app/tmp
*.version
app/scripts/config.js
pkg/build-info
pkg/packlist
rel/pkg/build-info
rel/pkg/packlist
node_modules
.tmp
.sass-cache
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: package

package: version
make -C pkg package
make -C rel/pkg package

version:
echo "$(shell git symbolic-ref HEAD 2> /dev/null | cut -b 12-)-$(shell git log --pretty=format:'%h, %ad UTC' --date=local -1)" > jingles.version
Expand Down
8 changes: 4 additions & 4 deletions pkg/Makefile → rel/pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ COMPONENT=fifo-jingles

package_list:
echo "@pkgdep nginx>=1.3.13" > packlist
(cd ../; find LICENSE* -type f | sort) >> packlist
(cd ../; find config -type f | sort) >> packlist
(cd ../; find dist -type f | sort) >> packlist
(cd ../../; find LICENSE* -type f | sort) >> packlist
(cd ../../; find config -type f | sort) >> packlist
(cd ../../; find dist -type f | sort) >> packlist

build_info:
pkg_info -X pkg_install | egrep '^(MACHINE_ARCH|OPSYS|OS_VERSION|PKGTOOLS_VERSION)' >build-info
Expand All @@ -18,4 +18,4 @@ clean:
-rm *.tgz build-info packlist

package: package_list build_info
pkg_create -i install.sh -k deinstall.sh -D displayfile -B build-info -c comment -d description -f packlist -I /opt/local/$(COMPONENT) -p ../ -U $(COMPONENT)-$(VERSION)$(SUFFIX).tgz
pkg_create -i install.sh -k deinstall.sh -D displayfile -B build-info -c comment -d description -f packlist -I /opt/local/$(COMPONENT) -p ../../ -U $(COMPONENT)-$(VERSION)$(SUFFIX).tgz
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 1251490

Please sign in to comment.