{"thread":{"id":"23755","subject":"[Patch 001/GSoC] Move static files into subdir","startedAt":"2010-05-09T13:56:30Z","lastAt":"2010-05-18T00:06:05Z","messageCount":17,"participants":["Pavan Kumar Sunkara","Christian Couder","Jakub Narebski","Ramkumar Ramachandra"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"141312","messageId":"p2ze72faaa81005090656j593c3464v9ee1bb6432461efc@mail.gmail.com","threadId":"23755","inReplyTo":null,"subject":"[Patch 001/GSoC] Move static files into subdir","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-09T13:56:30Z","receivedAt":"2010-05-09T13:56:30Z","isPatch":true,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"Hi,\n\nIt's been a while I mail to this list since I got GSoC. But I have\nbeen in contact with Christian and Petr (mentors) everyday. As I am\nhaving my vacation, I decided to statrt the project earlier itself.\nHere's is my first patch in the process of my GSoC.\n\nOne of my project goals is to split gitweb. This patch initiates the splitting.\n\nPATCH:\n\n>From e25db0b62b481e029354ad33af8f0615a8353633 Mon Sep 17 00:00:00 2001\nFrom: Pavan Kumar Sunkara \nDate: Wed, 5 May 2010 21:44:57 -0700\nSubject: [PATCH] Gitweb: Move all static files into a seperate directory\n\nThis commit creates a new subdirectory called 'static' in gitweb\nwhich will contain all the static files required by gitweb.cgi\nwhile executing. By doing so, the gitweb source will be more\nreadable and maintainable.\n\nAlso changed INSTALL, README, Makefile and test files\naccording to this change.\n\nSigned-off-by: Pavan Kumar Sunkara \n---\n gitweb/INSTALL | 20 ++++++++++----------\n gitweb/Makefile | 20 ++++++++++----------\n gitweb/README | 8 ++++----\n gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n gitweb/{ => static}/gitweb.css | 0\n gitweb/{ => static}/gitweb.js | 0\n t/gitweb-lib.sh | 6 +++---\n 8 files changed, 27 insertions(+), 27 deletions(-)\n rename gitweb/{ => static}/git-favicon.png (100%)\n rename gitweb/{ => static}/git-logo.png (100%)\n rename gitweb/{ => static}/gitweb.css (100%)\n rename gitweb/{ => static}/gitweb.js (100%)\n\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex cbdc136..60c25ff 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -7,7 +7,8 @@ gitweb.css, git-logo.png and git-favicon.png) to their\ndestination.\n For example if git was (or is) installed with /usr prefix, you can do\n\n \t$ make prefix=/usr gitweb ;# as yourself\n-\t# cp gitweb/git* /var/www/cgi-bin/ ;# as root\n+\t# cp gitweb/gitweb.cgi /var/www/cgi-bin/ ;# as root\n+\t# cp -r gitweb/static /var/www/cgi-bin/ ;# as root\n\n Alternatively you can use autoconf generated ./configure script to\n set up path to git binaries (via config.mak.autogen), so you can write\n@@ -16,7 +17,8 @@ instead\n \t$ make configure ;# as yourself\n \t$ ./configure --prefix=/usr ;# as yourself\n \t$ make gitweb ;# as yourself\n-\t# cp gitweb/git* /var/www/cgi-bin/ ;# as root\n+\t# cp gitweb/gitweb.cgi /var/www/cgi-bin/ ;# as root\n+\t# cp -r gitweb/static /var/www/cgi-bin/ ;# as root\n\n The above example assumes that your web server is configured to run\n [executable] files in /var/www/cgi-bin/ as server scripts (as CGI\n@@ -79,17 +81,15 @@ Build example\n we want to display are under /home/local/scm, you can do\n\n \tmake GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n-\t GITWEB_JS=\"/gitweb/gitweb.js\" \\\n-\t GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n-\t GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n-\t GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n+\t GITWEB_JS=\"/gitweb/static/gitweb.js\" \\\n+\t GITWEB_CSS=\"/gitweb/static/gitweb.css\" \\\n+\t GITWEB_LOGO=\"/gitweb/static/git-logo.png\" \\\n+\t GITWEB_FAVICON=\"/gitweb/static/git-favicon.png\" \\\n \t bindir=/usr/local/bin \\\n \t gitweb\n\n-\tcp -fv ~/git/gitweb/gitweb.{cgi,js,css} \\\n-\t ~/git/gitweb/git-{favicon,logo}.png \\\n-\t /var/www/cgi-bin/gitweb/\n-\n+\tcp -fv gitweb/gitweb.cgi /var/www/cgi-bin/gitweb/\n+\tcp -r gitweb/static /var/www/cgi-bin/gitweb/\n\n Gitweb config file\n ------------------\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nindex f2e1d92..c0d5da3 100644\n--- a/gitweb/Makefile\n+++ b/gitweb/Makefile\n@@ -26,10 +26,10 @@ GITWEB_STRICT_EXPORT =\n GITWEB_BASE_URL =\n GITWEB_LIST =\n GITWEB_HOMETEXT = indextext.html\n-GITWEB_CSS = gitweb.css\n-GITWEB_LOGO = git-logo.png\n-GITWEB_FAVICON = git-favicon.png\n-GITWEB_JS = gitweb.js\n+GITWEB_CSS = static/gitweb.css\n+GITWEB_LOGO = static/git-logo.png\n+GITWEB_FAVICON = static/git-favicon.png\n+GITWEB_JS = static/gitweb.js\n GITWEB_SITE_HEADER =\n GITWEB_SITE_FOOTER =\n\n@@ -81,16 +81,16 @@ endif\n all:: gitweb.cgi\n\n ifdef JSMIN\n-GITWEB_JS = gitweb.min.js\n-all:: gitweb.min.js\n-gitweb.min.js: gitweb.js GITWEB-BUILD-OPTIONS\n+GITWEB_JS = static/gitweb.min.js\n+all:: static/gitweb.min.js\n+static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(JSMIN) <$< >$@\n endif\n\n ifdef CSSMIN\n-GITWEB_CSS = gitweb.min.css\n-all:: gitweb.min.css\n-gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS\n+GITWEB_CSS = static/gitweb.min.css\n+all:: static/gitweb.min.css\n+static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(CSSMIN) <$ >$@\n endif\n\ndiff --git a/gitweb/README b/gitweb/README\nindex 71742b3..eeac204 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -80,23 +80,23 @@ You can specify the following configuration\nvariables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n- the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n+ the gitweb config file. [Default: static/gitweb.css (or\ngitweb.min.css if the\n CSSMIN variable is defined / CSS minifier is used)]\n * GITWEB_LOGO\n Points to the location where you put git-logo.png on your web server\n (or to be more generic URI of logo, 72x27 size, displayed in top right\n corner of each gitweb page, and used as logo for Atom feed). Relative\n- to base URI of gitweb. [Default: git-logo.png]\n+ to base URI of gitweb. [Default: static/git-logo.png]\n * GITWEB_FAVICON\n Points to the location where you put git-favicon.png on your web server\n (or to be more generic URI of favicon, assumed to be image/png type;\n web browsers that support favicons (website icons) may display them\n in the browser's URL bar and next to site name in bookmarks). Relative\n- to base URI of gitweb. [Default: git-favicon.png]\n+ to base URI of gitweb. [Default: static/git-favicon.png]\n * GITWEB_JS\n Points to the localtion where you put gitweb.js on your web server\n (or to be more generic URI of JavaScript code used by gitweb).\n- Relative to base URI of gitweb. [Default: gitweb.js (or gitweb.min.js\n+ Relative to base URI of gitweb. [Default: static/gitweb.js (or\ngitweb.min.js\n if JSMIN build variable is defined / JavaScript minifier is used)]\n * GITWEB_CONFIG\n This Perl file will be loaded using 'do' and can be used to override any\ndiff --git a/gitweb/gitweb.css b/gitweb/static/gitweb.css\nsimilarity index 100%\nrename from gitweb/gitweb.css\nrename to gitweb/static/gitweb.css\ndiff --git a/gitweb/gitweb.js b/gitweb/static/gitweb.js\nsimilarity index 100%\nrename from gitweb/gitweb.js\nrename to gitweb/static/gitweb.js\ndiff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\nindex 5a734b1..b70b891 100644\n--- a/t/gitweb-lib.sh\n+++ b/t/gitweb-lib.sh\n@@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n our \\$site_header = '';\n our \\$site_footer = '';\n our \\$home_text = 'indextext.html';\n-our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n-our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n-our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n+our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n+our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n+our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n our \\$projects_list = '';\n our \\$export_ok = '';\n our \\$strict_export = '';\n-- \n1.7.0.4\n"},{"id":"141317","messageId":"201005091910.05193.chriscool@tuxfamily.org","threadId":"23755","inReplyTo":"p2ze72faaa81005090656j593c3464v9ee1bb6432461efc@mail.gmail.com","subject":"Re: [Patch 001/GSoC] Move static files into subdir","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2010-05-09T17:10:05Z","receivedAt":"2010-05-09T17:10:05Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Sunday 09 May 2010 15:56:30 Pavan Kumar Sunkara wrote:\nHi,\n\n> Hi,\n> \n> It's been a while I mail to this list since I got GSoC. But I have\n> been in contact with Christian and Petr (mentors) everyday. As I am\n> having my vacation, I decided to statrt the project earlier itself.\n> Here's is my first patch in the process of my GSoC.\n> \n> One of my project goals is to split gitweb. This patch initiates the\n> splitting.\n\nAll of the above should go after the three dashes and before the diffstat \nbellow.\n\nPlease try to look at the submitting patch documentation and what other \npeople's patches look like.\n\n> From e25db0b62b481e029354ad33af8f0615a8353633 Mon Sep 17 00:00:00 2001\n> From: Pavan Kumar Sunkara \n> Date: Wed, 5 May 2010 21:44:57 -0700\n\nThe above line should not appear.\n\n> Subject: [PATCH] Gitweb: Move all static files into a seperate directory\n\nThis line should be the subject of your email.\nIf you really want to say that it's a GSoC patch you can use [PATCH GSoC] \ninstead of [PATCH] but please don't put \"001/GSoC\".\n\n> This commit creates a new subdirectory called 'static' in gitweb\n> which will contain all the static files required by gitweb.cgi\n> while executing. By doing so, the gitweb source will be more\n> readable and maintainable.\n> \n> Also changed INSTALL, README, Makefile and test files\n> according to this change.\n> \n> Signed-off-by: Pavan Kumar Sunkara \n> ---\n\nThe comments that you put on top of the patch should go here.\n\n> gitweb/INSTALL | 20 ++++++++++----------\n> gitweb/Makefile | 20 ++++++++++----------\n> gitweb/README | 8 ++++----\n> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n> gitweb/{ => static}/gitweb.css | 0\n> gitweb/{ => static}/gitweb.js | 0\n> t/gitweb-lib.sh | 6 +++---\n> 8 files changed, 27 insertions(+), 27 deletions(-)\n> rename gitweb/{ => static}/git-favicon.png (100%)\n> rename gitweb/{ => static}/git-logo.png (100%)\n> rename gitweb/{ => static}/gitweb.css (100%)\n> rename gitweb/{ => static}/gitweb.js (100%)\n\n[...]\n\nRegards,\nChristian.\n"},{"id":"141318","messageId":"n2ie72faaa81005091048hf229bd13qf29f9bfd5d58ac16@mail.gmail.com","threadId":"23755","inReplyTo":"201005091910.05193.chriscool@tuxfamily.org","subject":"Re: [Patch 001/GSoC] Move static files into subdir","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-09T17:48:09Z","receivedAt":"2010-05-09T17:48:09Z","isPatch":true,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"I will try to follow them from next time onwards.\n\nThanks\n\n- Pavan\n\nOn Sun, May 9, 2010 at 10:40 PM, Christian Couder\n wrote:\n> On Sunday 09 May 2010 15:56:30 Pavan Kumar Sunkara wrote:\n> Hi,\n>\n>> Hi,\n>>\n>> It's been a while I mail to this list since I got GSoC. But I have\n>> been in contact with Christian and Petr (mentors) everyday. As I am\n>> having my vacation, I decided to statrt the project earlier itself.\n>> Here's is my first patch in the process of my GSoC.\n>>\n>> One of my project goals is to split gitweb. This patch initiates the\n>> splitting.\n>\n> All of the above should go after the three dashes and before the diffstat\n> bellow.\n>\n> Please try to look at the submitting patch documentation and what other\n> people's patches look like.\n>\n>> From e25db0b62b481e029354ad33af8f0615a8353633 Mon Sep 17 00:00:00 2001\n>> From: Pavan Kumar Sunkara \n>> Date: Wed, 5 May 2010 21:44:57 -0700\n>\n> The above line should not appear.\n>\n>> Subject: [PATCH] Gitweb: Move all static files into a seperate directory\n>\n> This line should be the subject of your email.\n> If you really want to say that it's a GSoC patch you can use [PATCH GSoC]\n> instead of [PATCH] but please don't put \"001/GSoC\".\n>\n>> This commit creates a new subdirectory called 'static' in gitweb\n>> which will contain all the static files required by gitweb.cgi\n>> while executing. By doing so, the gitweb source will be more\n>> readable and maintainable.\n>>\n>> Also changed INSTALL, README, Makefile and test files\n>> according to this change.\n>>\n>> Signed-off-by: Pavan Kumar Sunkara \n>> ---\n>\n> The comments that you put on top of the patch should go here.\n>\n>> gitweb/INSTALL | 20 ++++++++++----------\n>> gitweb/Makefile | 20 ++++++++++----------\n>> gitweb/README | 8 ++++----\n>> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n>> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n>> gitweb/{ => static}/gitweb.css | 0\n>> gitweb/{ => static}/gitweb.js | 0\n>> t/gitweb-lib.sh | 6 +++---\n>> 8 files changed, 27 insertions(+), 27 deletions(-)\n>> rename gitweb/{ => static}/git-favicon.png (100%)\n>> rename gitweb/{ => static}/git-logo.png (100%)\n>> rename gitweb/{ => static}/gitweb.css (100%)\n>> rename gitweb/{ => static}/gitweb.js (100%)\n>\n> [...]\n>\n> Regards,\n> Christian.\n>\n"},{"id":"141338","messageId":"m3bpcoenci.fsf@localhost.localdomain","threadId":"23755","inReplyTo":"p2ze72faaa81005090656j593c3464v9ee1bb6432461efc@mail.gmail.com","subject":"Re: [Patch 001/GSoC] Move static files into subdir","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-05-09T22:13:26Z","receivedAt":"2010-05-09T22:13:26Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Pavan Kumar Sunkara writes:\n\n> Hi,\n> \n> It's been a while I mail to this list since I got GSoC. But I have\n> been in contact with Christian and Petr (mentors) everyday. As I am\n> having my vacation, I decided to statrt the project earlier itself.\n> Here's is my first patch in the process of my GSoC.\n> \n> One of my project goals is to split gitweb. This patch initiates the splitting.\n> \n> PATCH:\n> \n> From e25db0b62b481e029354ad33af8f0615a8353633 Mon Sep 17 00:00:00 2001\n> From: Pavan Kumar Sunkara \n> Date: Wed, 5 May 2010 21:44:57 -0700\n> Subject: [PATCH] Gitweb: Move all static files into a seperate directory\n\nAlmost all right. Please read Documentation/SubmittingChanges first.\n\nThere are two ways of submitting a patch with some comment about patch\nthat should not be put in commit message.\n\nThe first is to put first line (summary) of a commit message, in your\ncase\n [PATCH GSoC] gitweb: Move all static files into a seperate directory\nin *email* subject, and put comments about patch itself between \"---\\n\"\nline and diffstat (see also below).\n\nThe second, used for example if the patch is byproduct of an email, is\nto write comment in the email, and add patch itself after a separator.\nCommonly used separator is 'scissors' line (see git-mailinfo(1)), e.g.\n\"-- >8 --\\n\" line. You need to write 'Subject:' line _only_ if the\nsubject of an email is different.\n\nThe first is more commonly used, as you can see by looking at emails\nmarked with '[PATCH]' in git mailing list; you can use mailing list\narchive like MARC or GMane, or GMane NNTP (Usenet) interface reading\nit with news reader.\n \n> This commit creates a new subdirectory called 'static' in gitweb\n> which will contain all the static files required by gitweb.cgi\n> while executing. By doing so, the gitweb source will be more\n> readable and maintainable.\n\nA minor issue: commit messages are usually written in imperative;\nalso I'd rather avoid marketspeak-sounding \"will be\":\n\n Create a new subdirectory called 'static' in gitweb/, and move\n all static files required by gitweb.cgi when running, which means\n styles, images and Javascript code. This should make gitweb more\n readable and easier to maintain.\n\n\nI also wonder how other project solve this issue. Well, Gitalist\nuses 'root/static/'...\n\n> \n> Also changed INSTALL, README, Makefile and test files\n> according to this change.\n\nA minor issue: \"Also changed\" doesn't look like correct English\ngrammar for me. I am not a native English speaker either, but I would\npersonally write:\n\n Update t/gitweb-lib.sh to reflect this change. The default is\n now to install static files also in 'static' subdirectory in target\n directory: update gitweb's INSTALL, README and Makefile accordingly.\n\n\nNote that favicon.ico should be installed in top directory, but I\nthink it doesn't really matter where is git-favicon.png as long as\n'' points in correct place...\n\n> \n> Signed-off-by: Pavan Kumar Sunkara \n> ---\n> gitweb/INSTALL | 20 ++++++++++----------\n> gitweb/Makefile | 20 ++++++++++----------\n> gitweb/README | 8 ++++----\n> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n> gitweb/{ => static}/gitweb.css | 0\n> gitweb/{ => static}/gitweb.js | 0\n> t/gitweb-lib.sh | 6 +++---\n> 8 files changed, 27 insertions(+), 27 deletions(-)\n> rename gitweb/{ => static}/git-favicon.png (100%)\n> rename gitweb/{ => static}/git-logo.png (100%)\n> rename gitweb/{ => static}/gitweb.css (100%)\n> rename gitweb/{ => static}/gitweb.js (100%)\n\nYou might need to update also git-instaweb.sh and generating\ngit-instaweb in main Makefile.\n\n> \n> diff --git a/gitweb/INSTALL b/gitweb/INSTALL\n> index cbdc136..60c25ff 100644\n> --- a/gitweb/INSTALL\n> +++ b/gitweb/INSTALL\n> @@ -7,7 +7,8 @@ gitweb.css, git-logo.png and git-favicon.png) to their\n> destination.\n> For example if git was (or is) installed with /usr prefix, you can do\n> \n> \t$ make prefix=/usr gitweb ;# as yourself\n> -\t# cp gitweb/git* /var/www/cgi-bin/ ;# as root\n> +\t# cp gitweb/gitweb.cgi /var/www/cgi-bin/ ;# as root\n> +\t# cp -r gitweb/static /var/www/cgi-bin/ ;# as root\n\nThis assumes that ones 'cp' support -r / --recursive option.\nHow portable is this?\n\nBut I think this might be all right in an example.\n\n> @@ -79,17 +81,15 @@ Build example\n> we want to display are under /home/local/scm, you can do\n> \n> \tmake GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n> -\t GITWEB_JS=\"/gitweb/gitweb.js\" \\\n> -\t GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n> -\t GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n> -\t GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n> +\t GITWEB_JS=\"/gitweb/static/gitweb.js\" \\\n> +\t GITWEB_CSS=\"/gitweb/static/gitweb.css\" \\\n> +\t GITWEB_LOGO=\"/gitweb/static/git-logo.png\" \\\n> +\t GITWEB_FAVICON=\"/gitweb/static/git-favicon.png\" \\\n> \t bindir=/usr/local/bin \\\n> \t gitweb\n> \n> -\tcp -fv ~/git/gitweb/gitweb.{cgi,js,css} \\\n> -\t ~/git/gitweb/git-{favicon,logo}.png \\\n> -\t /var/www/cgi-bin/gitweb/\n> -\n> +\tcp -fv gitweb/gitweb.cgi /var/www/cgi-bin/gitweb/\n> +\tcp -r gitweb/static /var/www/cgi-bin/gitweb/\n\nSidenote (something to think about in the future): we might want to\nput static files in /var/www/html/gitweb/ (but not in \n/var/www/html/gitweb/static/), outside of where gitweb.cgi is put.\n \n> diff --git a/gitweb/Makefile b/gitweb/Makefile\n> index f2e1d92..c0d5da3 100644\n> --- a/gitweb/Makefile\n> +++ b/gitweb/Makefile\n> @@ -26,10 +26,10 @@ GITWEB_STRICT_EXPORT =\n> GITWEB_BASE_URL =\n> GITWEB_LIST =\n> GITWEB_HOMETEXT = indextext.html\n> -GITWEB_CSS = gitweb.css\n> -GITWEB_LOGO = git-logo.png\n> -GITWEB_FAVICON = git-favicon.png\n> -GITWEB_JS = gitweb.js\n> +GITWEB_CSS = static/gitweb.css\n> +GITWEB_LOGO = static/git-logo.png\n> +GITWEB_FAVICON = static/git-favicon.png\n> +GITWEB_JS = static/gitweb.js\n> GITWEB_SITE_HEADER =\n> GITWEB_SITE_FOOTER =\n> \n> @@ -81,16 +81,16 @@ endif\n> all:: gitweb.cgi\n> \n> ifdef JSMIN\n> -GITWEB_JS = gitweb.min.js\n> -all:: gitweb.min.js\n> -gitweb.min.js: gitweb.js GITWEB-BUILD-OPTIONS\n> +GITWEB_JS = static/gitweb.min.js\n> +all:: static/gitweb.min.js\n> +static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS\n> \t$(QUIET_GEN)$(JSMIN) <$< >$@\n> endif\n> \n> ifdef CSSMIN\n> -GITWEB_CSS = gitweb.min.css\n> -all:: gitweb.min.css\n> -gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS\n> +GITWEB_CSS = static/gitweb.min.css\n> +all:: static/gitweb.min.css\n> +static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS\n> \t$(QUIET_GEN)$(CSSMIN) <$ >$@\n> endif\n\nYou need to update 'clean' target in gitweb/Makefile too.\n \n> diff --git a/gitweb/README b/gitweb/README\n> index 71742b3..eeac204 100644\n> --- a/gitweb/README\n> +++ b/gitweb/README\n> @@ -80,23 +80,23 @@ You can specify the following configuration\n> variables when building GIT:\n> Points to the location where you put gitweb.css on your web server\n> (or to be more generic, the URI of gitweb stylesheet). Relative to the\n> base URI of gitweb. Note that you can setup multiple stylesheets from\n> - the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n> + the gitweb config file. [Default: static/gitweb.css (or\n> gitweb.min.css if the\n> CSSMIN variable is defined / CSS minifier is used)]\n\nWord wrapped patch. It should read:\n\n @@ -80,23 +80,23 @@ You can specify the following configuration\n variables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n - the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n + the gitweb config file. [Default: static/gitweb.css (or gitweb.min.css if the\n CSSMIN variable is defined / CSS minifier is used)]\n\nYou need to turn off line wrapping in your email client when sending a\npatch. Here it is minor issue.\n\nAlso you forgot to update gitweb.min.css to static/gitweb.min.css...\nin which case you should probably rewrap this line to:\n\n @@ -80,24 +80,24 @@ You can specify the following configuration\n variables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n - the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n - CSSMIN variable is defined / CSS minifier is used)]\n + the gitweb config file. [Default: static/gitweb.css (or static/gitweb.min.css\n + if the CSSMIN variable is defined / CSS minifier is used)]\n\n[...]\n\n> - Relative to base URI of gitweb. [Default: gitweb.js (or gitweb.min.js\n> + Relative to base URI of gitweb. [Default: static/gitweb.js (or\n> gitweb.min.js\n\nWord-wrapped.\n\n> diff --git a/gitweb/gitweb.css b/gitweb/static/gitweb.css\n> similarity index 100%\n> rename from gitweb/gitweb.css\n> rename to gitweb/static/gitweb.css\n\nGood!\n\n[...]\n> diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\n> index 5a734b1..b70b891 100644\n> --- a/t/gitweb-lib.sh\n> +++ b/t/gitweb-lib.sh\n> @@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n> our \\$site_header = '';\n> our \\$site_footer = '';\n> our \\$home_text = 'indextext.html';\n> -our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n> -our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n> -our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n> +our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n> +our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n> +our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n> our \\$projects_list = '';\n> our \\$export_ok = '';\n> our \\$strict_export = '';\n\nThanks for thinking about this... although it doesn't really matter,\nas it is not served to a web browser.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"141388","messageId":"AANLkTim2rIFDBRChBxTiWZCNmd8ozwKQzM3RZOEr3mgp@mail.gmail.com","threadId":"23755","inReplyTo":"m3bpcoenci.fsf@localhost.localdomain","subject":"Re: [Patch 001/GSoC] Move static files into subdir","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-10T11:44:36Z","receivedAt":"2010-05-10T11:44:36Z","isPatch":true,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"Gitweb: Move static files into seperate subdirectory\n\nCreate a new subdirectory called 'static' in gitweb/, and move\nall static files required by gitweb.cgi when running, which means\nstyles, images and Javascript code. This should make gitweb more\nreadable and easier to maintain.\n\nUpdate t/gitweb-lib.sh to reflect this change. The default is\nnow to install static files also in 'static' subdirectory in target\ndirectory: update Makefile, gitweb's INSTALL, README and Makefile\naccordingly.\n\nSigned-off-by: Pavan Kumar Sunkara \n---\n Makefile | 20 ++++++++++----------\n gitweb/INSTALL | 20 ++++++++++----------\n gitweb/Makefile | 20 ++++++++++----------\n gitweb/README | 13 +++++++------\n gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n gitweb/{ => static}/gitweb.css | 0\n gitweb/{ => static}/gitweb.js | 0\n t/gitweb-lib.sh | 6 +++---\n 9 files changed, 40 insertions(+), 39 deletions(-)\n rename gitweb/{ => static}/git-favicon.png (100%)\n rename gitweb/{ => static}/git-logo.png (100%)\n rename gitweb/{ => static}/gitweb.css (100%)\n rename gitweb/{ => static}/gitweb.js (100%)\n\ndiff --git a/Makefile b/Makefile\nindex 910f471..fe34c22 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1561,32 +1561,32 @@ gitweb:\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n\n ifdef JSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.js\n-GITWEB_JS = gitweb/gitweb.min.js\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.js\n+GITWEB_JS = gitweb/static/gitweb.min.js\n else\n-GITWEB_JS = gitweb/gitweb.js\n+GITWEB_JS = gitweb/static/gitweb.js\n endif\n ifdef CSSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.css\n-GITWEB_CSS = gitweb/gitweb.min.css\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.css\n+GITWEB_CSS = gitweb/static/gitweb.min.css\n else\n-GITWEB_CSS = gitweb/gitweb.css\n+GITWEB_CSS = gitweb/static/gitweb.css\n endif\n OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)\n gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n\n ifdef JSMIN\n-gitweb/gitweb.min.js: gitweb/gitweb.js\n+gitweb/static/gitweb.min.js: gitweb/static/gitweb.js\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # JSMIN\n ifdef CSSMIN\n-gitweb/gitweb.min.css: gitweb/gitweb.css\n+gitweb/static/gitweb.min.css: gitweb/static/gitweb.css\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # CSSMIN\n\n\n-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css\ngitweb/gitweb.js\n+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi\ngitweb/static/gitweb.css gitweb/static/gitweb.js\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tsed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n@@ -2098,7 +2098,7 @@ clean:\n \t$(RM) $(htmldocs).tar.gz $(manpages).tar.gz\n \t$(MAKE) -C Documentation/ clean\n ifndef NO_PERL\n-\t$(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*\n+\t$(RM) gitweb/gitweb.cgi gitweb/static/gitweb.min.*\n \t$(MAKE) -C perl clean\n endif\n ifndef NO_PYTHON\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex cbdc136..0b4693f 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -7,7 +7,8 @@ gitweb.css, git-logo.png and git-favicon.png) to their\ndestination.\n For example if git was (or is) installed with /usr prefix, you can do\n\n \t$ make prefix=/usr gitweb ;# as yourself\n-\t# cp gitweb/git* /var/www/cgi-bin/ ;# as root\n+\t# cp gitweb/gitweb.cgi /var/www/cgi-bin/ ;# as root\n+\t# cp -r gitweb/static /var/www/cgi-bin/ ;# as root\n\n Alternatively you can use autoconf generated ./configure script to\n set up path to git binaries (via config.mak.autogen), so you can write\n@@ -16,7 +17,8 @@ instead\n \t$ make configure ;# as yourself\n \t$ ./configure --prefix=/usr ;# as yourself\n \t$ make gitweb ;# as yourself\n-\t# cp gitweb/git* /var/www/cgi-bin/ ;# as root\n+\t# cp gitweb/gitweb.cgi /var/www/cgi-bin/ ;# as root\n+\t# cp -r gitweb/static /var/www/cgi-bin/ ;# as root\n\n The above example assumes that your web server is configured to run\n [executable] files in /var/www/cgi-bin/ as server scripts (as CGI\n@@ -79,17 +81,15 @@ Build example\n we want to display are under /home/local/scm, you can do\n\n \tmake GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n-\t GITWEB_JS=\"/gitweb/gitweb.js\" \\\n-\t GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n-\t GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n-\t GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n+\t GITWEB_JS=\"/gitweb/static/gitweb.js\" \\\n+\t GITWEB_CSS=\"/gitweb/static/gitweb.css\" \\\n+\t GITWEB_LOGO=\"/gitweb/static/git-logo.png\" \\\n+\t GITWEB_FAVICON=\"/gitweb/static/git-favicon.png\" \\\n \t bindir=/usr/local/bin \\\n \t gitweb\n\n-\tcp -fv ~/git/gitweb/gitweb.{cgi,js,css} \\\n-\t ~/git/gitweb/git-{favicon,logo}.png \\\n-\t /var/www/cgi-bin/gitweb/\n-\n+\tcp -fv ~/git/gitweb/gitweb.cgi /var/www/cgi-bin/gitweb/\n+\tcp -r ~/git/gitweb/static /var/www/cgi-bin/gitweb/\n\n Gitweb config file\n ------------------\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nindex f2e1d92..c0d5da3 100644\n--- a/gitweb/Makefile\n+++ b/gitweb/Makefile\n@@ -26,10 +26,10 @@ GITWEB_STRICT_EXPORT =\n GITWEB_BASE_URL =\n GITWEB_LIST =\n GITWEB_HOMETEXT = indextext.html\n-GITWEB_CSS = gitweb.css\n-GITWEB_LOGO = git-logo.png\n-GITWEB_FAVICON = git-favicon.png\n-GITWEB_JS = gitweb.js\n+GITWEB_CSS = static/gitweb.css\n+GITWEB_LOGO = static/git-logo.png\n+GITWEB_FAVICON = static/git-favicon.png\n+GITWEB_JS = static/gitweb.js\n GITWEB_SITE_HEADER =\n GITWEB_SITE_FOOTER =\n\n@@ -81,16 +81,16 @@ endif\n all:: gitweb.cgi\n\n ifdef JSMIN\n-GITWEB_JS = gitweb.min.js\n-all:: gitweb.min.js\n-gitweb.min.js: gitweb.js GITWEB-BUILD-OPTIONS\n+GITWEB_JS = static/gitweb.min.js\n+all:: static/gitweb.min.js\n+static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(JSMIN) <$< >$@\n endif\n\n ifdef CSSMIN\n-GITWEB_CSS = gitweb.min.css\n-all:: gitweb.min.css\n-gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS\n+GITWEB_CSS = static/gitweb.min.css\n+all:: static/gitweb.min.css\n+static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(CSSMIN) <$ >$@\n endif\n\ndiff --git a/gitweb/README b/gitweb/README\nindex 71742b3..8e063c0 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -80,24 +80,25 @@ You can specify the following configuration\nvariables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n- the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n- CSSMIN variable is defined / CSS minifier is used)]\n+ the gitweb config file. [Default: static/gitweb.css (or\nstatic/gitweb.min.css\n+ if the CSSMIN variable is defined / CSS minifier is used)]\n * GITWEB_LOGO\n Points to the location where you put git-logo.png on your web server\n (or to be more generic URI of logo, 72x27 size, displayed in top right\n corner of each gitweb page, and used as logo for Atom feed). Relative\n- to base URI of gitweb. [Default: git-logo.png]\n+ to base URI of gitweb. [Default: static/git-logo.png]\n * GITWEB_FAVICON\n Points to the location where you put git-favicon.png on your web server\n (or to be more generic URI of favicon, assumed to be image/png type;\n web browsers that support favicons (website icons) may display them\n in the browser's URL bar and next to site name in bookmarks). Relative\n- to base URI of gitweb. [Default: git-favicon.png]\n+ to base URI of gitweb. [Default: static/git-favicon.png]\n * GITWEB_JS\n Points to the localtion where you put gitweb.js on your web server\n (or to be more generic URI of JavaScript code used by gitweb).\n- Relative to base URI of gitweb. [Default: gitweb.js (or gitweb.min.js\n- if JSMIN build variable is defined / JavaScript minifier is used)]\n+ Relative to base URI of gitweb. [Default: static/gitweb.js (or\n+ static/gitweb.min.js if JSMIN build variable is defined / JavaScript\n+ minifier is used)]\n * GITWEB_CONFIG\n This Perl file will be loaded using 'do' and can be used to override any\n of the options above as well as some other options -- see the \"Runtime\ndiff --git a/gitweb/gitweb.css b/gitweb/static/gitweb.css\nsimilarity index 100%\nrename from gitweb/gitweb.css\nrename to gitweb/static/gitweb.css\ndiff --git a/gitweb/gitweb.js b/gitweb/static/gitweb.js\nsimilarity index 100%\nrename from gitweb/gitweb.js\nrename to gitweb/static/gitweb.js\ndiff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\nindex 5a734b1..b70b891 100644\n--- a/t/gitweb-lib.sh\n+++ b/t/gitweb-lib.sh\n@@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n our \\$site_header = '';\n our \\$site_footer = '';\n our \\$home_text = 'indextext.html';\n-our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n-our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n-our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n+our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n+our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n+our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n our \\$projects_list = '';\n our \\$export_ok = '';\n our \\$strict_export = '';\n-- \n1.7.0.4\n\nThis is the new patch which includes the changes suggested by Jakub.\n\nRegarding wordwrap, all the mailing ports in my university are closed\nwhich leaves me only the gmail web cient which don't have any option\nto disable wordwrap. I will try to find a workaround for this. Please\nbear with my wordwrap until then.\n\nThanks\n-Pavan\n"},{"id":"141389","messageId":"AANLkTilUB6bevzYOMoLXgFBkGtwyG-VUIYA1JPhoVYd_@mail.gmail.com","threadId":"23755","inReplyTo":"AANLkTim2rIFDBRChBxTiWZCNmd8ozwKQzM3RZOEr3mgp@mail.gmail.com","subject":"Re: [Patch 001/GSoC] Move static files into subdir","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-05-10T11:53:06Z","receivedAt":"2010-05-10T11:53:06Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi,\n\n> Regarding wordwrap, all the mailing ports in my university are closed\n> which leaves me only the gmail web cient which don't have any option\n> to disable wordwrap. I will try to find a workaround for this. Please\n> bear with my wordwrap until then.\n\nI was in a similar situation earlier. My suggestion: find out if your\nfirewall allows HTTP CONNECT on all the ports; if it does, simply use\nsomething similar to Corkscrew. If it doesn't, I suggest that you buy\na VPS from a cheap provider who'll allow you to listen for SSH\nconnections on port 443, and use that to send email. I've found that\ngit-send-email + msmtp is a good combination. If you don't want to\ncopy files over to the server everytime you want to send email, can\nuse something similar to proxychains.\n\nHope this helps.\n\n-- Ram\n"},{"id":"141392","messageId":"201005101455.50633.jnareb@gmail.com","threadId":"23755","inReplyTo":"AANLkTim2rIFDBRChBxTiWZCNmd8ozwKQzM3RZOEr3mgp@mail.gmail.com","subject":"Re: [PATCHv2 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-05-10T12:55:45Z","receivedAt":"2010-05-10T12:55:45Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Only minor comments about submission itself. Patch I think is now\nall right with added required changes to main Makefile.\n\n\nOn Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n\n> Gitweb: Move static files into seperate subdirectory\n\nThis should be the subject of an email, like now is (only without\n\"Re:\"), and this line should be missing from email body.\n\nOr you need to use\n\n Subject: gitweb: Move static files into seperate subdirectory\n\nIt is customary to start subsystem prefix with lowercase.\n\n> \n> Create a new subdirectory called 'static' in gitweb/, and move\n> all static files required by gitweb.cgi when running, which means\n> styles, images and Javascript code. This should make gitweb more\n> readable and easier to maintain.\n> \n> Update t/gitweb-lib.sh to reflect this change. The default is\n> now to install static files also in 'static' subdirectory in target\n> directory: update Makefile, gitweb's INSTALL, README and Makefile\n> \n> Signed-off-by: Pavan Kumar Sunkara \n> ---\n\nThe comments about patch itself should be put *here*, between \"---\\n\"\nand diffstat.\n\n> \n> This is the new patch which includes the changes suggested by Jakub.\n> \n> Regarding wordwrap, all the mailing ports in my university are closed\n> which leaves me only the gmail web cient which don't have any option\n> to disable wordwrap. I will try to find a workaround for this. Please\n> bear with my wordwrap until then.\n> \n> Thanks\n> -Pavan\n \nLike this.\n\n> Makefile | 20 ++++++++++----------\n> gitweb/INSTALL | 20 ++++++++++----------\n> gitweb/Makefile | 20 ++++++++++----------\n> gitweb/README | 13 +++++++------\n> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n> gitweb/{ => static}/gitweb.css | 0\n> gitweb/{ => static}/gitweb.js | 0\n> t/gitweb-lib.sh | 6 +++---\n> 9 files changed, 40 insertions(+), 39 deletions(-)\n> rename gitweb/{ => static}/git-favicon.png (100%)\n> rename gitweb/{ => static}/git-logo.png (100%)\n> rename gitweb/{ => static}/gitweb.css (100%)\n> rename gitweb/{ => static}/gitweb.js (100%)\n\n[...]\n-- \nJakub Narebski\nPoland\n"},{"id":"141394","messageId":"4BE803B8.4090607@gmail.com","threadId":"23755","inReplyTo":"201005101455.50633.jnareb@gmail.com","subject":"Re: [PATCHv2 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-10T13:01:44Z","receivedAt":"2010-05-10T13:01:44Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"On Monday 10 May 2010 06:25 PM, Jakub Narebski wrote:\n> Only minor comments about submission itself. Patch I think is now\n> all right with added required changes to main Makefile.\n>\n>\n> On Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n>\n> \n>> Gitweb: Move static files into seperate subdirectory\n>> \n> This should be the subject of an email, like now is (only without\n> \"Re:\"), and this line should be missing from email body.\n>\n> Or you need to use\n>\n> Subject: gitweb: Move static files into seperate subdirectory\n>\n> It is customary to start subsystem prefix with lowercase.\n>\n> \n>> Create a new subdirectory called 'static' in gitweb/, and move\n>> all static files required by gitweb.cgi when running, which means\n>> styles, images and Javascript code. This should make gitweb more\n>> readable and easier to maintain.\n>>\n>> Update t/gitweb-lib.sh to reflect this change. The default is\n>> now to install static files also in 'static' subdirectory in target\n>> directory: update Makefile, gitweb's INSTALL, README and Makefile\n>>\n>> Signed-off-by: Pavan Kumar Sunkara\n>> ---\n>> \n> The comments about patch itself should be put *here*, between \"---\\n\"\n> and diffstat.\n>\n> \n>> This is the new patch which includes the changes suggested by Jakub.\n>>\n>> Regarding wordwrap, all the mailing ports in my university are closed\n>> which leaves me only the gmail web cient which don't have any option\n>> to disable wordwrap. I will try to find a workaround for this. Please\n>> bear with my wordwrap until then.\n>>\n>> Thanks\n>> -Pavan\n>> \n>\n> Like this.\n>\n> \n>> Makefile | 20 ++++++++++----------\n>> gitweb/INSTALL | 20 ++++++++++----------\n>> gitweb/Makefile | 20 ++++++++++----------\n>> gitweb/README | 13 +++++++------\n>> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n>> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n>> gitweb/{ => static}/gitweb.css | 0\n>> gitweb/{ => static}/gitweb.js | 0\n>> t/gitweb-lib.sh | 6 +++---\n>> 9 files changed, 40 insertions(+), 39 deletions(-)\n>> rename gitweb/{ => static}/git-favicon.png (100%)\n>> rename gitweb/{ => static}/git-logo.png (100%)\n>> rename gitweb/{ => static}/gitweb.css (100%)\n>> rename gitweb/{ => static}/gitweb.js (100%)\n>> \n> [...]\n> \n\nOk. I will follow this format from next time onwards.\n\nAnd thanks to ramkumar I found a solution to use email clients on ports.\n\nI would like to know when this patch will be merged.\n\nThanks\n- Pavan\n"},{"id":"141496","messageId":"201005120127.55971.jnareb@gmail.com","threadId":"23755","inReplyTo":"4BE803B8.4090607@gmail.com","subject":"Re: [PATCHv2 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-05-11T23:27:54Z","receivedAt":"2010-05-11T23:27:54Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n> On Monday 10 May 2010 06:25 PM, Jakub Narebski wrote:\n>> On Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n>> \n>>> Gitweb: Move static files into seperate subdirectory\n>>> \n>>> Create a new subdirectory called 'static' in gitweb/, and move\n>>> all static files required by gitweb.cgi when running, which means\n>>> styles, images and Javascript code. This should make gitweb more\n>>> readable and easier to maintain.\n>>>\n>>> Update t/gitweb-lib.sh to reflect this change. The default is\n>>> now to install static files also in 'static' subdirectory in target\n>>> directory: update Makefile, gitweb's INSTALL, README and Makefile\n>>>\n>>> Signed-off-by: Pavan Kumar Sunkara\n \n> I would like to know when this patch will be merged.\n\nNote please that this patch conflict on semantic level with the\npatch adding support for 'install' target in gitweb/Makefile (and \ninstall-gitweb to the main Makefile), which means that either this\none or the 'jn/gitweb-install' would have to be changed.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"141503","messageId":"AANLkTikrNRJY4vQetIfBF5OOx8ZmHc4gFs1zkOgOZkXe@mail.gmail.com","threadId":"23755","inReplyTo":"201005120127.55971.jnareb@gmail.com","subject":"Re: [PATCHv2 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-12T05:15:36Z","receivedAt":"2010-05-12T05:15:36Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"On Wed, May 12, 2010 at 4:57 AM, Jakub Narebski wrote:\n> On Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n>> On Monday 10 May 2010 06:25 PM, Jakub Narebski wrote:\n>>> On Mon, 10 May 2010, Pavan Kumar Sunkara wrote:\n>>>\n>>>> Gitweb: Move static files into seperate subdirectory\n>>>>\n>>>> Create a new subdirectory called 'static' in gitweb/, and move\n>>>> all static files required by gitweb.cgi when running, which means\n>>>> styles, images and Javascript code. This should make gitweb more\n>>>> readable and easier to maintain.\n>>>>\n>>>> Update t/gitweb-lib.sh to reflect this change.  The default is\n>>>> now to install static files also in 'static' subdirectory in target\n>>>> directory: update Makefile, gitweb's INSTALL, README and Makefile\n>>>>\n>>>> Signed-off-by: Pavan Kumar Sunkara\n>\n>> I would like to know when this patch will be merged.\n>\n> Note please that this patch conflict on semantic level with the\n> patch adding support for 'install' target in gitweb/Makefile (and\n> install-gitweb to the main Makefile), which means that either this\n> one or the 'jn/gitweb-install' would have to be changed.\n>\n> --\n> Jakub Narebski\n> Poland\n>\n\nYeah, actually me and petr have been discussing about 'install' target\nin gitweb/Makefile. So, I will apply these 2 patches\nhttp://repo.or.cz/w/alt-git.git/patch/152d94348f6a38eb7cb5f4af8397f51ba06ddffb\nhttp://repo.or.cz/w/alt-git.git/patch/8515392f5d4c5a36a0f9e4a73068f7106d7f4638\n\nand resubmit this patch.\n\nThanks\n- Pavan\n"},{"id":"141511","messageId":"4BEA5E2F.9070608@gmail.com","threadId":"23755","inReplyTo":"201005120127.55971.jnareb@gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-12T07:52:15Z","receivedAt":"2010-05-12T07:52:15Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"Create a new subdirectory called 'static' in gitweb/, and move\nall static files required by gitweb.cgi when running, which means\nstyles, images and Javascript code. This should make gitweb more\nreadable and easier to maintain.\n\nUpdate t/gitweb-lib.sh to reflect this change.The install-gitweb\nnow also include moving of static files into 'static' subdirectory\nin target directory: update Makefile, gitweb's INSTALL, README and\nMakefile accordingly.\n\nSigned-off-by: Pavan Kumar Sunkara \n---\n\nThis patch is rewritten based on 'jn/gitweb-install' as per the \nsuggestion of Jakub Nareski\n\n Makefile | 20 ++++++++--------\n gitweb/INSTALL | 19 +++++++--------\n gitweb/Makefile | 41 \n++++++++++++++++++----------------\n gitweb/README | 14 ++++++-----\n gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n gitweb/{ => static}/gitweb.css | 0\n gitweb/{ => static}/gitweb.js | 0\n t/gitweb-lib.sh | 6 ++--\n 9 files changed, 52 insertions(+), 48 deletions(-)\n rename gitweb/{ => static}/git-favicon.png (100%)\n rename gitweb/{ => static}/git-logo.png (100%)\n rename gitweb/{ => static}/gitweb.css (100%)\n rename gitweb/{ => static}/gitweb.js (100%)\n\ndiff --git a/Makefile b/Makefile\nindex dab5a14..de7f680 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1561,32 +1561,32 @@ gitweb:\n $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n\n ifdef JSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.js\n-GITWEB_JS = gitweb/gitweb.min.js\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.js\n+GITWEB_JS = gitweb/static/gitweb.min.js\n else\n-GITWEB_JS = gitweb/gitweb.js\n+GITWEB_JS = gitweb/static/gitweb.js\n endif\n ifdef CSSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.css\n-GITWEB_CSS = gitweb/gitweb.min.css\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.css\n+GITWEB_CSS = gitweb/static/gitweb.min.css\n else\n-GITWEB_CSS = gitweb/gitweb.css\n+GITWEB_CSS = gitweb/static/gitweb.css\n endif\n OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)\n gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)\n $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n\n ifdef JSMIN\n-gitweb/gitweb.min.js: gitweb/gitweb.js\n+gitweb/static/gitweb.min.js: gitweb/static/gitweb.js\n $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # JSMIN\n ifdef CSSMIN\n-gitweb/gitweb.min.css: gitweb/gitweb.css\n+gitweb/static/gitweb.min.css: gitweb/static/gitweb.css\n $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # CSSMIN\n\n\n-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css \ngitweb/gitweb.js\n+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi \ngitweb/static/gitweb.css gitweb/static/gitweb.js\n $(QUIET_GEN)$(RM) $@ $@+ && \\\n sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \\\n -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n@@ -2101,7 +2101,7 @@ clean:\n $(RM) $(htmldocs).tar.gz $(manpages).tar.gz\n $(MAKE) -C Documentation/ clean\n ifndef NO_PERL\n- $(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*\n+ $(RM) gitweb/gitweb.cgi gitweb/static/gitweb.min.*\n $(MAKE) -C perl clean\n endif\n ifndef NO_PYTHON\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex d484d76..8230531 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -2,9 +2,10 @@ GIT web Interface (gitweb) Installation\n =======================================\n\n First you have to generate gitweb.cgi from gitweb.perl using\n-\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n-gitweb.css, git-logo.png and git-favicon.png) to their destination.\n-For example if git was (or is) installed with /usr prefix, you can do\n+\"make gitweb\", then \"make install-gitweb\" appropriate files\n+(gitweb.cgi, gitweb.js, gitweb.css, git-logo.png and git-favicon.png)\n+to their destination. For example if git was (or is) installed with\n+/usr prefix and gitwebdir is /var/www/cgi-bin, you can do\n\n $ make prefix=/usr gitweb ;# as yourself\n # make gitwebdir=/var/www/cgi-bin install-gitweb ;# as root\n@@ -81,16 +82,14 @@ Build example\n minifiers, you can do\n\n make GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n- GITWEB_JS=\"/gitweb/gitweb.js\" \\\n- GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n- GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n- GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n+ GITWEB_JS=\"gitweb/static/gitweb.js\" \\\n+ GITWEB_CSS=\"gitweb/static/gitweb.css\" \\\n+ GITWEB_LOGO=\"gitweb/static/git-logo.png\" \\\n+ GITWEB_FAVICON=\"gitweb/static/git-favicon.png\" \\\n bindir=/usr/local/bin \\\n gitweb\n\n- cp -fv gitweb/gitweb.{cgi,js,css} \\\n- gitweb/git-{favicon,logo}.png \\\n- /var/www/cgi-bin/gitweb/\n+ make gitwebdir=/var/www/cgi-bin/gitweb install-gitweb\n\n\n Gitweb config file\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nindex 935d2d2..3af71f7 100644\n--- a/gitweb/Makefile\n+++ b/gitweb/Makefile\n@@ -4,10 +4,10 @@ all::\n # Define V=1 to have a more verbose compile.\n #\n # Define JSMIN to point to JavaScript minifier that functions as\n-# a filter to have gitweb.js minified.\n+# a filter to have static/gitweb.js minified.\n #\n # Define CSSMIN to point to a CSS minifier in order to generate a minified\n-# version of gitweb.css\n+# version of static/gitweb.css\n #\n\n prefix ?= $(HOME)\n@@ -16,6 +16,7 @@ gitwebdir ?= /var/www/cgi-bin\n\n RM ?= rm -f\n INSTALL ?= install\n+MKDIR ?= mkdir\n\n # default configuration for gitweb\n GITWEB_CONFIG = gitweb_config.perl\n@@ -29,10 +30,10 @@ GITWEB_STRICT_EXPORT =\n GITWEB_BASE_URL =\n GITWEB_LIST =\n GITWEB_HOMETEXT = indextext.html\n-GITWEB_CSS = gitweb.css\n-GITWEB_LOGO = git-logo.png\n-GITWEB_FAVICON = git-favicon.png\n-GITWEB_JS = gitweb.js\n+GITWEB_CSS = static/gitweb.css\n+GITWEB_LOGO = static/git-logo.png\n+GITWEB_FAVICON = static/git-favicon.png\n+GITWEB_JS = static/gitweb.js\n GITWEB_SITE_HEADER =\n GITWEB_SITE_FOOTER =\n\n@@ -54,6 +55,7 @@ PERL_PATH ?= /usr/bin/perl\n # Shell quote;\n bindir_SQ = $(subst ','\\'',$(bindir))#'\n gitwebdir_SQ = $(subst ','\\'',$(gitwebdir))#'\n+gitwebfile_SQ = $(subst ','\\'',$(gitwebdir)/static)#'\n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))#'\n PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))#'\n DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))#'\n@@ -88,26 +90,26 @@ all:: gitweb.cgi\n GITWEB_PROGRAMS = gitweb.cgi\n\n ifdef JSMIN\n-GITWEB_FILES += gitweb.min.js\n-GITWEB_JS = gitweb.min.js\n-all:: gitweb.min.js\n-gitweb.min.js: gitweb.js GITWEB-BUILD-OPTIONS\n+GITWEB_FILES += static/gitweb.min.js\n+GITWEB_JS = static/gitweb.min.js\n+all:: static/gitweb.min.js\n+static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS\n $(QUIET_GEN)$(JSMIN) <$< >$@\n else\n-GITWEB_FILES += gitweb.js\n+GITWEB_FILES += static/gitweb.js\n endif\n\n ifdef CSSMIN\n-GITWEB_FILES += gitweb.min.css\n-GITWEB_CSS = gitweb.min.css\n-all:: gitweb.min.css\n-gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS\n+GITWEB_FILES += static/gitweb.min.css\n+GITWEB_CSS = static/gitweb.min.css\n+all:: static/gitweb.min.css\n+static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS\n $(QUIET_GEN)$(CSSMIN) <$ >$@\n else\n-GITWEB_FILES += gitweb.css\n+GITWEB_FILES += static/gitweb.css\n endif\n\n-GITWEB_FILES += git-logo.png git-favicon.png\n+GITWEB_FILES += static/git-logo.png static/git-favicon.png\n\n GITWEB_REPLACE = \\\n -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \\\n@@ -147,12 +149,13 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS\n install: all\n $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n- $(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n+ $(MKDIR) -p '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n+ $(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n\n ### Cleaning rules\n\n clean:\n- $(RM) gitweb.cgi gitweb.min.js gitweb.min.css GITWEB-BUILD-OPTIONS\n+ $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css \nGITWEB-BUILD-OPTIONS\n\n .PHONY: all clean install .FORCE-GIT-VERSION-FILE FORCE\n\ndiff --git a/gitweb/README b/gitweb/README\nindex 71742b3..5787260 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -80,24 +80,26 @@ You can specify the following configuration \nvariables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n- the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n- CSSMIN variable is defined / CSS minifier is used)]\n+ the gitweb config file. [Default: static/gitweb.css (or\n+ static/gitweb.min.css if the CSSMIN variable is defined / CSS minifier\n+ is used)]\n * GITWEB_LOGO\n Points to the location where you put git-logo.png on your web server\n (or to be more generic URI of logo, 72x27 size, displayed in top right\n corner of each gitweb page, and used as logo for Atom feed). Relative\n- to base URI of gitweb. [Default: git-logo.png]\n+ to base URI of gitweb. [Default: static/git-logo.png]\n * GITWEB_FAVICON\n Points to the location where you put git-favicon.png on your web server\n (or to be more generic URI of favicon, assumed to be image/png type;\n web browsers that support favicons (website icons) may display them\n in the browser's URL bar and next to site name in bookmarks). Relative\n- to base URI of gitweb. [Default: git-favicon.png]\n+ to base URI of gitweb. [Default: static/git-favicon.png]\n * GITWEB_JS\n Points to the localtion where you put gitweb.js on your web server\n (or to be more generic URI of JavaScript code used by gitweb).\n- Relative to base URI of gitweb. [Default: gitweb.js (or gitweb.min.js\n- if JSMIN build variable is defined / JavaScript minifier is used)]\n+ Relative to base URI of gitweb. [Default: static/gitweb.js (or\n+ static/gitweb.min.js if JSMIN build variable is defined / JavaScript\n+ minifier is used)]\n * GITWEB_CONFIG\n This Perl file will be loaded using 'do' and can be used to \noverride any\n of the options above as well as some other options -- see the \"Runtime\ndiff --git a/gitweb/gitweb.css b/gitweb/static/gitweb.css\nsimilarity index 100%\nrename from gitweb/gitweb.css\nrename to gitweb/static/gitweb.css\ndiff --git a/gitweb/gitweb.js b/gitweb/static/gitweb.js\nsimilarity index 100%\nrename from gitweb/gitweb.js\nrename to gitweb/static/gitweb.js\ndiff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\nindex 5a734b1..b70b891 100644\n--- a/t/gitweb-lib.sh\n+++ b/t/gitweb-lib.sh\n@@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n our \\$site_header = '';\n our \\$site_footer = '';\n our \\$home_text = 'indextext.html';\n-our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n-our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n-our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n+our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n+our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n+our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n our \\$projects_list = '';\n our \\$export_ok = '';\n our \\$strict_export = '';\n-- \n1.7.1.13.g35592.dirty\n"},{"id":"141563","messageId":"201005131054.01262.chriscool@tuxfamily.org","threadId":"23755","inReplyTo":"4BEA5E2F.9070608@gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2010-05-13T08:54:01Z","receivedAt":"2010-05-13T08:54:01Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Wednesday 12 May 2010 09:52:15 Pavan Kumar Sunkara wrote:\n> \n> First you have to generate gitweb.cgi from gitweb.perl using\n> -\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n> -gitweb.css, git-logo.png and git-favicon.png) to their destination.\n> -For example if git was (or is) installed with /usr prefix, you can do\n> +\"make gitweb\", then \"make install-gitweb\" appropriate files\n\nThere is something missing between 'then \"make install-gitweb\"' and \n'appropriate files', perhaps 'will copy'\n\n> +(gitweb.cgi, gitweb.js, gitweb.css, git-logo.png and git-favicon.png)\n> +to their destination. For example if git was (or is) installed with\n> +/usr prefix and gitwebdir is /var/www/cgi-bin, you can do\n> \n> $ make prefix=/usr gitweb ;# as yourself\n> # make gitwebdir=/var/www/cgi-bin install-gitweb ;# as root\n\nThanks,\nChristian.\n"},{"id":"141565","messageId":"4BEBC001.10803@gmail.com","threadId":"23755","inReplyTo":"201005131054.01262.chriscool@tuxfamily.org","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-13T09:01:53Z","receivedAt":"2010-05-13T09:01:53Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"\n>> First you have to generate gitweb.cgi from gitweb.perl using\n>> -\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n>> -gitweb.css, git-logo.png and git-favicon.png) to their destination.\n>> -For example if git was (or is) installed with /usr prefix, you can do\n>> +\"make gitweb\", then \"make install-gitweb\" appropriate files\n>> \n\nSorry about that.\n\n- Pavan\n"},{"id":"141680","messageId":"AANLkTimlfiIulCUGf9WHMU2f4wlR3in83VR9UkP0-vi6@mail.gmail.com","threadId":"23755","inReplyTo":"4BEBC001.10803@gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-14T16:15:35Z","receivedAt":"2010-05-14T16:15:35Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"Jakub, I would like to know the status of this patch.\n\nOn Thu, May 13, 2010 at 2:31 PM, Pavan Kumar Sunkara\n wrote:\n>\n>>>   First you have to generate gitweb.cgi from gitweb.perl using\n>>> -\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n>>> -gitweb.css, git-logo.png and git-favicon.png) to their destination.\n>>> -For example if git was (or is) installed with /usr prefix, you can do\n>>> +\"make gitweb\", then \"make install-gitweb\" appropriate files\n>>>\n>\n> Sorry about that.\n>\n> - Pavan\n>\n"},{"id":"141701","messageId":"201005142325.04747.jnareb@gmail.com","threadId":"23755","inReplyTo":"AANLkTimlfiIulCUGf9WHMU2f4wlR3in83VR9UkP0-vi6@mail.gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-05-14T21:25:03Z","receivedAt":"2010-05-14T21:25:03Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Fri, 14 May 2010, Pavan Kumar Sunkara wrote:\n\n> Jakub, I would like to know the status of this patch.\n\nI like it, and I think all issues (especially with regard to git-instaweb)\ngot addressed, but the patch itself is heavily whitespace damaged. Could\nyou please then resend it as attachement (of *.txt file to have text/plain),\nif you are not able to send it inline without whitespace munging? Thanks\nin advance.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"141716","messageId":"AANLkTine2dUMI6zrbJzvoyqRbV5phLhjM1zSYvJ-BRek@mail.gmail.com","threadId":"23755","inReplyTo":"201005142325.04747.jnareb@gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Pavan Kumar Sunkara","fromEmail":"pavan.sss1991@gmail.com","sentAt":"2010-05-15T08:47:34Z","receivedAt":"2010-05-15T08:47:34Z","isPatch":false,"sender":{"key":"pavan.sss1991@gmail.com","avatar":"https://avatars.githubusercontent.com/u/174703?v=4"},"body":"Here's the attachment of the patch.\nThe file is not whitespace damaged. That is a problem with my mail client\n\nPFA the patch.\n\nOn Sat, May 15, 2010 at 2:55 AM, Jakub Narebski wrote:\n> On Fri, 14 May 2010, Pavan Kumar Sunkara wrote:\n>\n>> Jakub, I would like to know the status of this patch.\n>\n> I like it, and I think all issues (especially with regard to git-instaweb)\n> got addressed, but the patch itself is heavily whitespace damaged.  Could\n> you please then resend it as attachement (of *.txt file to have text/plain),\n> if you are not able to send it inline without whitespace munging?  Thanks\n> in advance.\n>\n> --\n> Jakub Narebski\n> Poland\n>\n\n\nFrom 46758f50ce78975dbbbd63848eb9db56a36d6cf3 Mon Sep 17 00:00:00 2001\nFrom: Pavan Kumar Sunkara \nDate: Wed, 12 May 2010 13:11:41 +0530\nSubject: [PATCH 4/5] gitweb: Move static files into seperate subdirectory\n\nCreate a new subdirectory called 'static' in gitweb/, and move\nall static files required by gitweb.cgi when running, which means\nstyles, images and Javascript code. This should make gitweb more\nreadable and easier to maintain.\n\nUpdate t/gitweb-lib.sh to reflect this change.The install-gitweb\nnow also include moving of static files into 'static' subdirectory\nin target directory: update Makefile, gitweb's INSTALL, README and\nMakefile accordingly.\n\nSigned-off-by: Pavan Kumar Sunkara \n---\n Makefile | 20 ++++++++--------\n gitweb/INSTALL | 19 +++++++--------\n gitweb/Makefile | 41 ++++++++++++++++++----------------\n gitweb/README | 14 ++++++-----\n gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n gitweb/{ => static}/gitweb.css | 0\n gitweb/{ => static}/gitweb.js | 0\n t/gitweb-lib.sh | 6 ++--\n 9 files changed, 52 insertions(+), 48 deletions(-)\n rename gitweb/{ => static}/git-favicon.png (100%)\n rename gitweb/{ => static}/git-logo.png (100%)\n rename gitweb/{ => static}/gitweb.css (100%)\n rename gitweb/{ => static}/gitweb.js (100%)\n\ndiff --git a/Makefile b/Makefile\nindex dab5a14..de7f680 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1561,32 +1561,32 @@ gitweb:\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n \n ifdef JSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.js\n-GITWEB_JS = gitweb/gitweb.min.js\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.js\n+GITWEB_JS = gitweb/static/gitweb.min.js\n else\n-GITWEB_JS = gitweb/gitweb.js\n+GITWEB_JS = gitweb/static/gitweb.js\n endif\n ifdef CSSMIN\n-GITWEB_PROGRAMS += gitweb/gitweb.min.css\n-GITWEB_CSS = gitweb/gitweb.min.css\n+GITWEB_PROGRAMS += gitweb/static/gitweb.min.css\n+GITWEB_CSS = gitweb/static/gitweb.min.css\n else\n-GITWEB_CSS = gitweb/gitweb.css\n+GITWEB_CSS = gitweb/static/gitweb.css\n endif\n OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)\n gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n \n ifdef JSMIN\n-gitweb/gitweb.min.js: gitweb/gitweb.js\n+gitweb/static/gitweb.min.js: gitweb/static/gitweb.js\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # JSMIN\n ifdef CSSMIN\n-gitweb/gitweb.min.css: gitweb/gitweb.css\n+gitweb/static/gitweb.min.css: gitweb/static/gitweb.css\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n endif # CSSMIN\n \n \n-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js\n+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tsed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n@@ -2101,7 +2101,7 @@ clean:\n \t$(RM) $(htmldocs).tar.gz $(manpages).tar.gz\n \t$(MAKE) -C Documentation/ clean\n ifndef NO_PERL\n-\t$(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*\n+\t$(RM) gitweb/gitweb.cgi gitweb/static/gitweb.min.*\n \t$(MAKE) -C perl clean\n endif\n ifndef NO_PYTHON\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex d484d76..8230531 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -2,9 +2,10 @@ GIT web Interface (gitweb) Installation\n =======================================\n \n First you have to generate gitweb.cgi from gitweb.perl using\n-\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n-gitweb.css, git-logo.png and git-favicon.png) to their destination.\n-For example if git was (or is) installed with /usr prefix, you can do\n+\"make gitweb\", then \"make install-gitweb\" will copy appropriate files\n+(gitweb.cgi, gitweb.js, gitweb.css, git-logo.png and git-favicon.png)\n+to their destination. For example if git was (or is) installed with\n+/usr prefix and gitwebdir is /var/www/cgi-bin, you can do\n \n \t$ make prefix=/usr gitweb ;# as yourself\n \t# make gitwebdir=/var/www/cgi-bin install-gitweb ;# as root\n@@ -81,16 +82,14 @@ Build example\n minifiers, you can do\n \n \tmake GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n-\t GITWEB_JS=\"/gitweb/gitweb.js\" \\\n-\t GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n-\t GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n-\t GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n+\t GITWEB_JS=\"gitweb/static/gitweb.js\" \\\n+\t GITWEB_CSS=\"gitweb/static/gitweb.css\" \\\n+\t GITWEB_LOGO=\"gitweb/static/git-logo.png\" \\\n+\t GITWEB_FAVICON=\"gitweb/static/git-favicon.png\" \\\n \t bindir=/usr/local/bin \\\n \t gitweb\n \n-\tcp -fv gitweb/gitweb.{cgi,js,css} \\\n-\t gitweb/git-{favicon,logo}.png \\\n-\t /var/www/cgi-bin/gitweb/\n+\tmake gitwebdir=/var/www/cgi-bin/gitweb install-gitweb\n \n \n Gitweb config file\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nindex 935d2d2..3af71f7 100644\n--- a/gitweb/Makefile\n+++ b/gitweb/Makefile\n@@ -4,10 +4,10 @@ all::\n # Define V=1 to have a more verbose compile.\n #\n # Define JSMIN to point to JavaScript minifier that functions as\n-# a filter to have gitweb.js minified.\n+# a filter to have static/gitweb.js minified.\n #\n # Define CSSMIN to point to a CSS minifier in order to generate a minified\n-# version of gitweb.css\n+# version of static/gitweb.css\n #\n \n prefix ?= $(HOME)\n@@ -16,6 +16,7 @@ gitwebdir ?= /var/www/cgi-bin\n \n RM ?= rm -f\n INSTALL ?= install\n+MKDIR ?= mkdir\n \n # default configuration for gitweb\n GITWEB_CONFIG = gitweb_config.perl\n@@ -29,10 +30,10 @@ GITWEB_STRICT_EXPORT =\n GITWEB_BASE_URL =\n GITWEB_LIST =\n GITWEB_HOMETEXT = indextext.html\n-GITWEB_CSS = gitweb.css\n-GITWEB_LOGO = git-logo.png\n-GITWEB_FAVICON = git-favicon.png\n-GITWEB_JS = gitweb.js\n+GITWEB_CSS = static/gitweb.css\n+GITWEB_LOGO = static/git-logo.png\n+GITWEB_FAVICON = static/git-favicon.png\n+GITWEB_JS = static/gitweb.js\n GITWEB_SITE_HEADER =\n GITWEB_SITE_FOOTER =\n \n@@ -54,6 +55,7 @@ PERL_PATH ?= /usr/bin/perl\n # Shell quote;\n bindir_SQ = $(subst ','\\'',$(bindir))#'\n gitwebdir_SQ = $(subst ','\\'',$(gitwebdir))#'\n+gitwebfile_SQ = $(subst ','\\'',$(gitwebdir)/static)#'\n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))#'\n PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))#'\n DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))#'\n@@ -88,26 +90,26 @@ all:: gitweb.cgi\n GITWEB_PROGRAMS = gitweb.cgi\n \n ifdef JSMIN\n-GITWEB_FILES += gitweb.min.js\n-GITWEB_JS = gitweb.min.js\n-all:: gitweb.min.js\n-gitweb.min.js: gitweb.js GITWEB-BUILD-OPTIONS\n+GITWEB_FILES += static/gitweb.min.js\n+GITWEB_JS = static/gitweb.min.js\n+all:: static/gitweb.min.js\n+static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(JSMIN) <$< >$@\n else\n-GITWEB_FILES += gitweb.js\n+GITWEB_FILES += static/gitweb.js\n endif\n \n ifdef CSSMIN\n-GITWEB_FILES += gitweb.min.css\n-GITWEB_CSS = gitweb.min.css\n-all:: gitweb.min.css\n-gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS\n+GITWEB_FILES += static/gitweb.min.css\n+GITWEB_CSS = static/gitweb.min.css\n+all:: static/gitweb.min.css\n+static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS\n \t$(QUIET_GEN)$(CSSMIN) <$ >$@\n else\n-GITWEB_FILES += gitweb.css\n+GITWEB_FILES += static/gitweb.css\n endif\n \n-GITWEB_FILES += git-logo.png git-favicon.png\n+GITWEB_FILES += static/git-logo.png static/git-favicon.png\n \n GITWEB_REPLACE = \\\n \t-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \\\n@@ -147,12 +149,13 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS\n install: all\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n \t$(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n-\t$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n+\t$(MKDIR) -p '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n+\t$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n \n ### Cleaning rules\n \n clean:\n-\t$(RM) gitweb.cgi gitweb.min.js gitweb.min.css GITWEB-BUILD-OPTIONS\n+\t$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS\n \n .PHONY: all clean install .FORCE-GIT-VERSION-FILE FORCE\n \ndiff --git a/gitweb/README b/gitweb/README\nindex 71742b3..5787260 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -80,24 +80,26 @@ You can specify the following configuration variables when building GIT:\n Points to the location where you put gitweb.css on your web server\n (or to be more generic, the URI of gitweb stylesheet). Relative to the\n base URI of gitweb. Note that you can setup multiple stylesheets from\n- the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n- CSSMIN variable is defined / CSS minifier is used)]\n+ the gitweb config file. [Default: static/gitweb.css (or\n+ static/gitweb.min.css if the CSSMIN variable is defined / CSS minifier\n+ is used)]\n * GITWEB_LOGO\n Points to the location where you put git-logo.png on your web server\n (or to be more generic URI of logo, 72x27 size, displayed in top right\n corner of each gitweb page, and used as logo for Atom feed). Relative\n- to base URI of gitweb. [Default: git-logo.png]\n+ to base URI of gitweb. [Default: static/git-logo.png]\n * GITWEB_FAVICON\n Points to the location where you put git-favicon.png on your web server\n (or to be more generic URI of favicon, assumed to be image/png type;\n web browsers that support favicons (website icons) may display them\n in the browser's URL bar and next to site name in bookmarks). Relative\n- to base URI of gitweb. [Default: git-favicon.png]\n+ to base URI of gitweb. [Default: static/git-favicon.png]\n * GITWEB_JS\n Points to the localtion where you put gitweb.js on your web server\n (or to be more generic URI of JavaScript code used by gitweb).\n- Relative to base URI of gitweb. [Default: gitweb.js (or gitweb.min.js\n- if JSMIN build variable is defined / JavaScript minifier is used)]\n+ Relative to base URI of gitweb. [Default: static/gitweb.js (or\n+ static/gitweb.min.js if JSMIN build variable is defined / JavaScript\n+ minifier is used)]\n * GITWEB_CONFIG\n This Perl file will be loaded using 'do' and can be used to override any\n of the options above as well as some other options -- see the \"Runtime\ndiff --git a/gitweb/gitweb.css b/gitweb/static/gitweb.css\nsimilarity index 100%\nrename from gitweb/gitweb.css\nrename to gitweb/static/gitweb.css\ndiff --git a/gitweb/gitweb.js b/gitweb/static/gitweb.js\nsimilarity index 100%\nrename from gitweb/gitweb.js\nrename to gitweb/static/gitweb.js\ndiff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\nindex 5a734b1..b70b891 100644\n--- a/t/gitweb-lib.sh\n+++ b/t/gitweb-lib.sh\n@@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n our \\$site_header = '';\n our \\$site_footer = '';\n our \\$home_text = 'indextext.html';\n-our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n-our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n-our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n+our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n+our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n+our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n our \\$projects_list = '';\n our \\$export_ok = '';\n our \\$strict_export = '';\n-- \n1.7.1.16.g5d405c.dirty\n\n"},{"id":"141848","messageId":"201005180206.07301.jnareb@gmail.com","threadId":"23755","inReplyTo":"AANLkTine2dUMI6zrbJzvoyqRbV5phLhjM1zSYvJ-BRek@mail.gmail.com","subject":"Re: [PATCHv3 GSoC] gitweb: Move static files into seperate subdirectory","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-05-18T00:06:05Z","receivedAt":"2010-05-18T00:06:05Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Sat, 15 May 2010, Pavan Kumar Sunkara wrote:\n\n> Here's the patch as an attachment.\n>\n> The file is not whitespace damaged. That is a problem with my mail client\n> \n> PFA the patch.\n\nIf you cannot use ordinary email client configured to send email via SMTPS\n(ports 465 or 587), or via git-send-email, you should consider attaching\npatches (perhaps in addition to having them inline) as file with *.txt\nextension (to force to use 'text/plain' mimetype, 8bit, no transfer\nencoding).\n\n-- >8 --\n> From: Pavan Kumar Sunkara \n> Subject: [PATCH 4/5] gitweb: Move static files into seperate subdirectory\n> \n> Create a new subdirectory called 'static' in gitweb/, and move\n> all static files required by gitweb.cgi when running, which means\n> styles, images and Javascript code. This should make gitweb more\n> readable and easier to maintain.\n> \n> Update t/gitweb-lib.sh to reflect this change. The install-gitweb\n> now also include moving of static files into 'static' subdirectory\n> in target directory: update Makefile, gitweb's INSTALL, README and\n> Makefile accordingly.\n> \n> Signed-off-by: Pavan Kumar Sunkara \n\nAlmost Acked-by: Jakub Narebski \n\nYou need to use 'install -d' instead of 'mkdir -p' for modified 'install'\ntarget of gitweb/Makefile.\n\n> ---\n\nHere you should mention that you base your patch on 'next', or even better\non which commit / which branch you base your changes on.\n\nSee this fragment of Documentation/SubmittingPatches:\n\n If you are preparing a work based on \"next\" branch, that is fine, but\n please mark it as such.\n\n> Makefile | 20 ++++++++--------\n> gitweb/INSTALL | 19 +++++++--------\n> gitweb/Makefile | 41 ++++++++++++++++++----------------\n> gitweb/README | 14 ++++++-----\n> gitweb/{ => static}/git-favicon.png | Bin 115 -> 115 bytes\n> gitweb/{ => static}/git-logo.png | Bin 207 -> 207 bytes\n> gitweb/{ => static}/gitweb.css | 0\n> gitweb/{ => static}/gitweb.js | 0\n> t/gitweb-lib.sh | 6 ++--\n> 9 files changed, 52 insertions(+), 48 deletions(-)\n> rename gitweb/{ => static}/git-favicon.png (100%)\n> rename gitweb/{ => static}/git-logo.png (100%)\n> rename gitweb/{ => static}/gitweb.css (100%)\n> rename gitweb/{ => static}/gitweb.js (100%)\n\n[...]\n> diff --git a/gitweb/INSTALL b/gitweb/INSTALL\n> index d484d76..8230531 100644\n> --- a/gitweb/INSTALL\n> +++ b/gitweb/INSTALL\n> @@ -2,9 +2,10 @@ GIT web Interface (gitweb) Installation\n> =======================================\n> \n> First you have to generate gitweb.cgi from gitweb.perl using\n> -\"make gitweb\", then copy appropriate files (gitweb.cgi, gitweb.js,\n> -gitweb.css, git-logo.png and git-favicon.png) to their destination.\n> -For example if git was (or is) installed with /usr prefix, you can do\n> +\"make gitweb\", then \"make install-gitweb\" will copy appropriate files\n> +(gitweb.cgi, gitweb.js, gitweb.css, git-logo.png and git-favicon.png)\n> +to their destination. For example if git was (or is) installed with\n> +/usr prefix and gitwebdir is /var/www/cgi-bin, you can do\n> \n> \t$ make prefix=/usr gitweb ;# as yourself\n> \t# make gitwebdir=/var/www/cgi-bin install-gitweb ;# as root\n\nThanks for noticing of what I missed when updating gitweb/INSTALL in 152d943\n(gitweb: Create install target for gitweb in Makefile, 2010-05-01)\n\n> @@ -81,16 +82,14 @@ Build example\n> minifiers, you can do\n> \n> \tmake GITWEB_PROJECTROOT=\"/home/local/scm\" \\\n> -\t GITWEB_JS=\"/gitweb/gitweb.js\" \\\n> -\t GITWEB_CSS=\"/gitweb/gitweb.css\" \\\n> -\t GITWEB_LOGO=\"/gitweb/git-logo.png\" \\\n> -\t GITWEB_FAVICON=\"/gitweb/git-favicon.png\" \\\n> +\t GITWEB_JS=\"gitweb/static/gitweb.js\" \\\n> +\t GITWEB_CSS=\"gitweb/static/gitweb.css\" \\\n> +\t GITWEB_LOGO=\"gitweb/static/git-logo.png\" \\\n> +\t GITWEB_FAVICON=\"gitweb/static/git-favicon.png\" \\\n> \t bindir=/usr/local/bin \\\n> \t gitweb\n> \n> -\tcp -fv gitweb/gitweb.{cgi,js,css} \\\n> -\t gitweb/git-{favicon,logo}.png \\\n> -\t /var/www/cgi-bin/gitweb/\n> +\tmake gitwebdir=/var/www/cgi-bin/gitweb install-gitweb\n\nHere I am not sure of we should not leave an example how to copy files\nmanually... but I guess with this form we wouldn't have to update this part\nif/when gitweb is split...\n\n> diff --git a/gitweb/Makefile b/gitweb/Makefile\n\n> @@ -16,6 +16,7 @@ gitwebdir ?= /var/www/cgi-bin\n> \n> RM ?= rm -f\n> INSTALL ?= install\n> +MKDIR ?= mkdir\n\nIs MKDIR really needed? The main Makefile doesn't use it. It is what\n\"$(INSTALL) -d ...\" is for this (the '-d' / '--directory') option would\ncreate each given directory and any missing parent directories).\n \n> @@ -54,6 +55,7 @@ PERL_PATH ?= /usr/bin/perl\n> # Shell quote;\n> bindir_SQ = $(subst ','\\'',$(bindir))#'\n> gitwebdir_SQ = $(subst ','\\'',$(gitwebdir))#'\n> +gitwebfile_SQ = $(subst ','\\'',$(gitwebdir)/static)#'\n> SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))#'\n> PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))#'\n> DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))#'\n\nI would name it gitwebstaticdir_SQ, but admittedly this is a matter of\ntaste. It can be named gitwebfile_SQ... although truth to be said it is \nNOT strictly NECESSARY, as \"$(gitwebdir_SQ)/static\" would work as well.\n\n> @@ -147,12 +149,13 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS\n> install: all\n> \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n> \t$(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n> -\t$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebdir_SQ)'\n> +\t$(MKDIR) -p '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n> +\t$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebfile_SQ)'\n\nUse\n\n +\t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)/static'\n +\t$(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebdir_SQ)/static'\n\ninstead.\n\nBTW. mkdir doesn't need to support '-p' option. See for example this part of\nautoconf documentation:\n\n - Macro: AS_MKDIR_P (FILENAME)\n Make the directory FILENAME, including intervening directories as\n necessary. This is equivalent to `mkdir -p FILENAME', except that\n it is portable to older versions of `mkdir' that lack support for\n the `-p' option.\n\n> diff --git a/gitweb/README b/gitweb/README\n> index 71742b3..5787260 100644\n> --- a/gitweb/README\n> +++ b/gitweb/README\n> @@ -80,24 +80,26 @@ You can specify the following configuration variables when building GIT:\n> Points to the location where you put gitweb.css on your web server\n> (or to be more generic, the URI of gitweb stylesheet). Relative to the\n> base URI of gitweb. Note that you can setup multiple stylesheets from\n> - the gitweb config file. [Default: gitweb.css (or gitweb.min.css if the\n> - CSSMIN variable is defined / CSS minifier is used)]\n> + the gitweb config file. [Default: static/gitweb.css (or\n> + static/gitweb.min.css if the CSSMIN variable is defined / CSS minifier\n> + is used)]\n ^----------------- stray space character?\n\n> diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh\n> index 5a734b1..b70b891 100644\n> --- a/t/gitweb-lib.sh\n> +++ b/t/gitweb-lib.sh\n> @@ -19,9 +19,9 @@ our \\$site_name = '[localhost]';\n> our \\$site_header = '';\n> our \\$site_footer = '';\n> our \\$home_text = 'indextext.html';\n> -our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/gitweb.css');\n> -our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png';\n> -our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png';\n> +our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css');\n> +our \\$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png';\n> +our \\$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png';\n> our \\$projects_list = '';\n> our \\$export_ok = '';\n> our \\$strict_export = '';\n\nThanks for updating that.\n\n-- \nJakub Narebski\nPoland\n"}]}