Permalink
Browse files

Added makefile

Fixed patch file
  • Loading branch information...
jasny committed Dec 20, 2011
1 parent 233c3c5 commit 1d8dc31c173f7126d3f234133c1b5d39fd2c602b
Showing with 8 additions and 1 deletion.
  1. +7 −0 Makefile
  2. +1 −1 app.patch
View
@@ -0,0 +1,7 @@
+all:
+ git submodule init
+ git submodule update
+ ( [ -e ../../.gitmodules ] && grep -q vendor/jasny ../../.gitmodules ) || rm -rf `find -name '.git*'`
+ patch -p1 -d ../.. < app.patch
+ php ../../app/console assets:install ../../web
+
View
@@ -6,7 +6,7 @@ diff -u Symfony-orig/app/AppKernel.php Symfony/app/AppKernel.php
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+ new Jasny\Bundle\BootstrapBundle\JasnyBootstrapBundle(),
-+ new Jasny\Bundle\VanillaBundle\VanillaBootstrapBundle(),
++ new Jasny\Bundle\VanillaBundle\JasnyVanillaBundle(),
new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
);

0 comments on commit 1d8dc31

Please sign in to comment.