From e4aace5f87690a170c18a8567faf501518c5dbf8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 24 Sep 2011 21:57:54 -0700 Subject: kilabytes wordpress theme --- header.php | 95 ++++++++++++++++++++ license.txt | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 376 insertions(+) create mode 100644 header.php create mode 100644 license.txt diff --git a/header.php b/header.php new file mode 100644 index 0000000..192b59f --- /dev/null +++ b/header.php @@ -0,0 +1,95 @@ + section and everything up till
+ * + * @package WordPress + * @subpackage Twenty_Eleven + * @since Twenty Eleven 1.0 + */ +?> + + + + +> + + + + +<?php + /* + * Print the <title> tag based on what is being viewed. + */ + global $page, $paged; + + wp_title( '|', true, 'right' ); + + // Add the blog name. + bloginfo( 'name' ); + + // Add the blog description for the home/front page. + $site_description = get_bloginfo( 'description', 'display' ); + if ( $site_description && ( is_home() || is_front_page() ) ) + echo " | $site_description"; + + // Add a page number if necessary: + if ( $paged >= 2 || $page >= 2 ) + echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ); + + ?> + + + + + + * tag of your theme, or you will break many plugins, which + * generally use this hook to add elements to such + * as styles, scripts, and meta tags. + */ + wp_head(); +?> + + +> +
+ + + +
\ No newline at end of file diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..5fbe4a7 --- /dev/null +++ b/license.txt @@ -0,0 +1,281 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + -- cgit v1.1-4-g5e80 From 11d588e4abde45f0f7e9533ca626ea5581836434 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 25 Sep 2011 00:05:54 -0700 Subject: meh do stuff --- .gitignore | 12 ++++++++ Makefile | 37 ++++++++++++++++++++++++ header.php | 95 -------------------------------------------------------------- 3 files changed, 49 insertions(+), 95 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile delete mode 100644 header.php diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4537eb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +# DO NOT EDIT, this file is automatically made by `Makefile' +# +# ignore everyting +* +# but these: +!img/swoosh.png +!style.scss +!header.php.patch +!Makefile +!logo-style.scss.php +!license.txt +!css_shadow.php diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..62429bb --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +RM = rm -f +CP = cp +PATCH = patch +SASS = sass +PHP = php5 + +srcfiles = \ + img/swoosh.png \ + style.scss \ + header.php.patch \ + Makefile \ + logo-style.scss.php \ + license.txt \ + css_shadow.php + +all: header.php style.css .gitignore + +style.css: logo-style.scss + +%: %.patch ../twentyeleven/% + $(RM) $@ + $(CP) ../twentyeleven/$@ $@ + $(PATCH) $@ < $@.patch + +%.css: %.scss + $(SASS) $< $@ + +%: %.php + $(PHP) -f $< > $@ + +.gitignore: Makefile + echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ + echo '# ' >> '$@' + echo '# ignore everyting' >> '$@' + echo '*' >> '$@' + echo '# but these:' >> '$@' + for file in $(srcfiles); do echo !"$$file" >> '$@'; done diff --git a/header.php b/header.php deleted file mode 100644 index 192b59f..0000000 --- a/header.php +++ /dev/null @@ -1,95 +0,0 @@ - section and everything up till
- * - * @package WordPress - * @subpackage Twenty_Eleven - * @since Twenty Eleven 1.0 - */ -?> - - - - -> - - - - -<?php - /* - * Print the <title> tag based on what is being viewed. - */ - global $page, $paged; - - wp_title( '|', true, 'right' ); - - // Add the blog name. - bloginfo( 'name' ); - - // Add the blog description for the home/front page. - $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) - echo " | $site_description"; - - // Add a page number if necessary: - if ( $paged >= 2 || $page >= 2 ) - echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ); - - ?> - - - - - - * tag of your theme, or you will break many plugins, which - * generally use this hook to add elements to such - * as styles, scripts, and meta tags. - */ - wp_head(); -?> - - -> -
- - - -
\ No newline at end of file -- cgit v1.1-4-g5e80 From 66184aab11c86d4d6d6d05dbe7dd4e7f5110b3d2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 25 Sep 2011 16:14:44 -0400 Subject: make swoosh.png from svg --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 62429bb..aad371c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SASS = sass PHP = php5 srcfiles = \ - img/swoosh.png \ + img/swoosh.svg \ style.scss \ header.php.patch \ Makefile \ @@ -13,7 +13,7 @@ srcfiles = \ license.txt \ css_shadow.php -all: header.php style.css .gitignore +all: header.php style.css img/swoosh.png .gitignore style.css: logo-style.scss @@ -28,6 +28,9 @@ style.css: logo-style.scss %: %.php $(PHP) -f $< > $@ +%.png: %.svg + rsvg-convert $< > $@ + .gitignore: Makefile echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ echo '# ' >> '$@' -- cgit v1.1-4-g5e80 From a7d01d7e2d8af20a4dd5ea5b15b1a2be197d10cd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Oct 2011 20:48:19 -0700 Subject: I ran magit to make my small commit, but noticed that apparently I hadn't commited in a while. So here. --- .gitignore | 3 ++- Makefile | 7 ++--- twentyeleven-fix.scss | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 twentyeleven-fix.scss diff --git a/.gitignore b/.gitignore index 4537eb6..639f69d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,11 @@ # ignore everyting * # but these: -!img/swoosh.png +!img/swoosh.svg !style.scss !header.php.patch !Makefile !logo-style.scss.php !license.txt !css_shadow.php +!twentyeleven-fix.scss diff --git a/Makefile b/Makefile index aad371c..c782b9b 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,12 @@ srcfiles = \ Makefile \ logo-style.scss.php \ license.txt \ - css_shadow.php + css_shadow.php \ + twentyeleven-fix.scss all: header.php style.css img/swoosh.png .gitignore -style.css: logo-style.scss +style.css: logo-style.scss twentyeleven-fix.scss %: %.patch ../twentyeleven/% $(RM) $@ @@ -29,7 +30,7 @@ style.css: logo-style.scss $(PHP) -f $< > $@ %.png: %.svg - rsvg-convert $< > $@ + rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$ .gitignore: Makefile echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ diff --git a/twentyeleven-fix.scss b/twentyeleven-fix.scss new file mode 100644 index 0000000..bbfa208 --- /dev/null +++ b/twentyeleven-fix.scss @@ -0,0 +1,71 @@ +body { + padding: 0; + #page header#branding #access { + ul { + :hover > ul, + :hover + ul, + :active > ul, + :active + ul, + :focus > ul, + :focus + ul { + display: block; + } + } + } +} + +@mixin searchform_wide($border_width) { + position: relative !important; + top: auto !important; + bottom: auto !important; + left: auto !important; + right: auto !important; + width: 100%; + max-width: none; + .field { + float: none; + width: 100%; + display: block; + margin-left: -$border_width; + } +} + +@media (max-width: 800px) { + body #page header#branding { + .only-search, #searchform { + padding-right: 10px+28px;// matches twentyeleven values + } + #searchform { + @include searchform_wide(1px); + } + #access { + ul, div { + margin: 0; + padding: 0; + } + ul { + li { + float: none; + display: block; + width: 50%; + ul { + left: 100%; + top: 0; + } + ul { + width: 100%; + li, a { + width: auto; + } + } + } + } + } + } +} + +#ie6 { + body #page header#branding #searchform { + @include searchform_wide(1px); + } +} -- cgit v1.1-4-g5e80 From 592e7b2b8213cc74e7bcf812cbee7c6db812757d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 13:39:16 -0500 Subject: fix a few issues in Makefile * find the correct php executable * don't ignore .gitignore * fix problems with .gitignore and directories --- .gitignore | 3 +++ Makefile | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 639f69d..3c706a1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ # ignore everyting * # but these: +!.gitignore +!img +img/* !img/swoosh.svg !style.scss !header.php.patch diff --git a/Makefile b/Makefile index c782b9b..f0eb157 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,13 @@ +pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH))))) + RM = rm -f CP = cp PATCH = patch SASS = sass -PHP = php5 +PHP := $(firstword $(call pathsearch,php5) $(call pathsearch,php)) srcfiles = \ + .gitignore \ img/swoosh.svg \ style.scss \ header.php.patch \ @@ -32,10 +35,21 @@ style.css: logo-style.scss twentyeleven-fix.scss %.png: %.svg rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$ + +in_dir = $(patsubst ./%,%,$(dir $1)) +my_dir = $(patsubst %/,%,$(dir $1)) +define gitignore_file +$(if $(in_dir), + $(call gitignore_file,$(my_dir)) + echo '$(my_dir)/*' >> '$@'; +) +echo '!$1' >> '$@'; +endef + .gitignore: Makefile echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ echo '# ' >> '$@' echo '# ignore everyting' >> '$@' echo '*' >> '$@' echo '# but these:' >> '$@' - for file in $(srcfiles); do echo !"$$file" >> '$@'; done + $(foreach file,$(srcfiles),$(call gitignore_file,$(file))) -- cgit v1.1-4-g5e80 From 7d6044395bdf9dbd4b06251f5e78c1016937e627 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 15:24:25 -0500 Subject: move non-generic things into theme.mk, add `clean' and `distclean' rules --- .gitignore | 5 +++-- Makefile | 36 ++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3c706a1..d348d80 100644 --- a/.gitignore +++ b/.gitignore @@ -3,14 +3,15 @@ # ignore everyting * # but these: -!.gitignore !img img/* !img/swoosh.svg !style.scss !header.php.patch -!Makefile !logo-style.scss.php !license.txt !css_shadow.php !twentyeleven-fix.scss +!.gitignore +!theme.mk +!Makefile diff --git a/Makefile b/Makefile index f0eb157..6f3ba14 100644 --- a/Makefile +++ b/Makefile @@ -6,20 +6,12 @@ PATCH = patch SASS = sass PHP := $(firstword $(call pathsearch,php5) $(call pathsearch,php)) -srcfiles = \ - .gitignore \ - img/swoosh.svg \ - style.scss \ - header.php.patch \ - Makefile \ - logo-style.scss.php \ - license.txt \ - css_shadow.php \ - twentyeleven-fix.scss +default: all -all: header.php style.css img/swoosh.png .gitignore +include theme.mk +srcfiles += .gitignore theme.mk Makefile -style.css: logo-style.scss twentyeleven-fix.scss +all: .gitignore $(targets) %: %.patch ../twentyeleven/% $(RM) $@ @@ -35,6 +27,7 @@ style.css: logo-style.scss twentyeleven-fix.scss %.png: %.svg rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$ +################################################################################ in_dir = $(patsubst ./%,%,$(dir $1)) my_dir = $(patsubst %/,%,$(dir $1)) @@ -53,3 +46,22 @@ endef echo '*' >> '$@' echo '# but these:' >> '$@' $(foreach file,$(srcfiles),$(call gitignore_file,$(file))) + +################################################################################ + +git2make = $1 $(subst *,.*,$1) +gitignore_y = $(call git2make,$(shell sed -n 's/^[^\#!]/&/p' .gitignore)) +gitignore_n = $(call git2make,$(shell sed -n 's/^!//p' .gitignore)) +gitignore_i = . .. .git %/.. %/. +gitignore = $(filter-out $(gitignore_i) $(wildcard $(gitignore_n)),$(wildcard $(gitignore_y))) + +clean: .gitignore PHONY + $(RM) -r $(filter-out $(targets),$(gitignore)) +distclean: .gitignore PHONY + $(RM) -r $(gitignore) + +################################################################################ + +.PHONY: FORCE PHONY +FORCE: ; +PHONY: ; -- cgit v1.1-4-g5e80 From 2b3122be7616032cef4be342b19395d0d59b3ff4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 15:24:56 -0500 Subject: turn rsvg-convert and pngcrush into variables --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f3ba14..e60e170 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ CP = cp PATCH = patch SASS = sass PHP := $(firstword $(call pathsearch,php5) $(call pathsearch,php)) +SVG2PNG = rsvg-convert +PNGCRUSH = $(firstword $(call pathsearch,pngcrush) $(call pathsearch,cp)) default: all @@ -25,7 +27,7 @@ all: .gitignore $(targets) $(PHP) -f $< > $@ %.png: %.svg - rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$ + $(SVG2PNG) $< > $@.$$$$ && $(PNGCRUSH) $@.$$$$ $@ ; $(RM) $@.$$$$ ################################################################################ -- cgit v1.1-4-g5e80 From 44adf924df39a350f6a620331cf35e75954fdd6e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 15:27:48 -0500 Subject: whoops, now .gitignore has to also depend on theme.mk --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e60e170..b17979b 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ $(if $(in_dir), echo '!$1' >> '$@'; endef -.gitignore: Makefile +.gitignore: Makefile theme.mk echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ echo '# ' >> '$@' echo '# ignore everyting' >> '$@' -- cgit v1.1-4-g5e80 From 0dfce348e4d118ed19bbcf8396a3f7b90fb0badc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 16:14:06 -0500 Subject: I don't want an autogenerated .gitignore here --- .gitignore | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index d348d80..5037b57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,7 @@ -# DO NOT EDIT, this file is automatically made by `Makefile' -# # ignore everyting * # but these: -!img -img/* -!img/swoosh.svg -!style.scss -!header.php.patch -!logo-style.scss.php !license.txt -!css_shadow.php !twentyeleven-fix.scss !.gitignore -!theme.mk !Makefile -- cgit v1.1-4-g5e80 From ea262045fbf26c153e6e4c46b5b67ad296cda8c1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Nov 2011 16:32:26 -0500 Subject: Add twentyeleven-fix.scss and license.txt to the implicit srcfiles list --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b17979b..7df9dba 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ PNGCRUSH = $(firstword $(call pathsearch,pngcrush) $(call pathsearch,cp)) default: all include theme.mk +srcfiles += twentyeleven-fix.scss license.txt srcfiles += .gitignore theme.mk Makefile all: .gitignore $(targets) -- cgit v1.1-4-g5e80