[marginalia] r552 committed - Update makefile...

[margi...@googlecode.com]

Revision: 552
Author: geof.glass
Date: Fri Jun 22 16:04:51 2012
Log: Update makefile
Change patch name from moodle2.patch to marginalia-m.patch

http://code.google.com/p/marginalia/source/detail?r=552

Modified:
/moodle/trunk/INSTALL.txt
/moodle/trunk/makefile

=======================================
--- /moodle/trunk/INSTALL.txt Fri Jun 22 15:59:29 2012
+++ /moodle/trunk/INSTALL.txt Fri Jun 22 16:04:51 2012
@@ -41,10 +41,10 @@
The patch file will update existing files in your Moodle installation. You
should do this from a clean Moodle install. If you previously had an older
version of Marginalia installed, you will need to restore the Moodle files
to
-their unpatched state before going ahead. To apply the patch, copy
moodle.patch
+their unpatched state before going ahead. To apply the patch, copy
marginalia-m.patch
into your moodle root directory and run the following command:

- patch -b -p 1 <moodle2.patch
+ patch -b -p 1 <marginalia-m.patch

The digit after the -p is the number, not the letter L. The -b option is
not
strictly necessary, but it makes it easier to (manually) uninstall
Marginalia by
=======================================
--- /moodle/trunk/makefile Thu Jun 3 15:48:59 2010
+++ /moodle/trunk/makefile Fri Jun 22 16:04:51 2012
@@ -21,28 +21,27 @@
$(MARGINALIA_MOODLE_DIR)/annotation_summary_query.php \
$(MARGINALIA_MOODLE_DIR)/block_marginalia.php \
$(MARGINALIA_MOODLE_DIR)/config.php \
- $(MARGINALIA_MOODLE_DIR)/tags.css \
- $(MARGINALIA_MOODLE_DIR)/tags.js \
- $(MARGINALIA_MOODLE_DIR)/tags.php \
+ $(MARGINALIA_MOODLE_DIR)/help.css \
+ $(MARGINALIA_MOODLE_DIR)/help.php \
$(MARGINALIA_MOODLE_DIR)/keywords.php \
$(MARGINALIA_MOODLE_DIR)/keywords_db.php \
$(MARGINALIA_MOODLE_DIR)/lib.php \
$(MARGINALIA_MOODLE_DIR)/marginalia-config.js \
- $(MARGINALIA_MOODLE_DIR)/marginalia-strings.js \
$(MARGINALIA_MOODLE_DIR)/MoodleMarginalia.js \
+ $(MARGINALIA_MOODLE_DIR)/moodle_marginalia.php \
$(MARGINALIA_MOODLE_DIR)/smartquote.js \
- $(MARGINALIA_MOODLE_DIR)/summary-styles.php \
$(MARGINALIA_MOODLE_DIR)/summary.js \
$(MARGINALIA_MOODLE_DIR)/summary.php \
+ $(MARGINALIA_MOODLE_DIR)/summary-styles.php \
$(MARGINALIA_MOODLE_DIR)/user-preference.php

VERSION_FILE = $(MARGINALIA_MOODLE_DIR)/version.php

-LANG_FILES = $(MARGINALIA_MOODLE_DIR)/lang/en_utf8/block_marginalia.php
+LANG_FILES = $(MARGINALIA_MOODLE_DIR)/lang/en/block_marginalia.php

HELP_FILES = \
- $(MARGINALIA_MOODLE_DIR)/lang/en_utf8/help/marginalia/annotate.html \
-
$(MARGINALIA_MOODLE_DIR)/lang/en_utf8/help/marginalia/annotation_summary.html
+ $(MARGINALIA_MOODLE_DIR)/lang/en/help/annotate.html \
+ $(MARGINALIA_MOODLE_DIR)/lang/en/help/annotation_summary.html

DB_DIR = $(MARGINALIA_MOODLE_DIR)/db
DB_FILES = \
@@ -58,54 +57,41 @@
CREDITS.txt \
INSTALL.txt

-DOC_FILES = \
- docs/CREDITS.html \
- docs/README.html \
- docs/INSTALL.html
-
-UTIL_FILES = \
- util/create-db.php \
- util/tables.sql \
-
release: zipcontents docs
cd $(OUTDIR); tar czf $(OUTNAME).tgz $(OUTNAME)
+ echo "Please confirm that this is the correct version for this release:"
+ grep plugin $(VERSION_FILE)

zipdir:
- mkdir -p $(ZIPDIR)/util
mkdir -p $(ZIPDIR)/doc
mkdir -p $(ZIPDIR)/moodle/blocks/marginalia/marginalia/3rd-party
mkdir -p $(ZIPDIR)/moodle/blocks/marginalia/marginalia-php
- mkdir -p $(ZIPDIR)/moodle/blocks/marginalia/lang/en_utf8/help/marginalia
+ mkdir -p $(ZIPDIR)/moodle/blocks/marginalia/lang/en/help
mkdir -p $(ZIPDIR)/moodle/blocks/marginalia/db
mkdir -p $(ZIPDIR)/moodle/mod/forum

-zipcontents: zipdir $(ZIPDIR)/moodle19.patch $(ZIPDIR)/moodle18.patch
$(UTIL_FILES) $(DOC_FILES) $(README_FILES) $(MARGINALIA_MOODLE_FILES)
$(MARGINALIA_LIB_FILES) $(MARGINALIA_LIB_3RDPARTY_FILES)
$(MARGINALIA_PHP_FILES) $(FORUM_FILES) $(LANG_FILES) $(HELP_FILES)
$(VERSION_FILE) $(DB_FILES)
+zipcontents: zipdir $(ZIPDIR)/marginalia-m.patch $(DOC_FILES)
$(README_FILES) $(MARGINALIA_MOODLE_FILES) $(MARGINALIA_LIB_FILES)
$(MARGINALIA_LIB_3RDPARTY_FILES) $(MARGINALIA_PHP_FILES) $(FORUM_FILES)
$(LANG_FILES) $(HELP_FILES) $(VERSION_FILE) $(DB_FILES)
cp $(MARGINALIA_MOODLE_FILES) $(ZIPDIR)/moodle/blocks/marginalia/
+ cp $(VERSION_FILE) $(ZIPDIR)/moodle/blocks/marginalia/
cp $(MARGINALIA_LIB_FILES) $(ZIPDIR)/moodle/blocks/marginalia/marginalia/
cp $(MARGINALIA_LIB_3RDPARTY_FILES)
$(ZIPDIR)/moodle/blocks/marginalia/marginalia/3rd-party/
cp $(MARGINALIA_PHP_FILES)
$(ZIPDIR)/moodle/blocks/marginalia/marginalia-php/
- cp $(LANG_FILES) $(ZIPDIR)/moodle/blocks/marginalia/lang/en_utf8/
- cp $(HELP_FILES)
$(ZIPDIR)/moodle/blocks/marginalia/lang/en_utf8/help/marginalia/
+ cp $(LANG_FILES) $(ZIPDIR)/moodle/blocks/marginalia/lang/en/
+ cp $(HELP_FILES) $(ZIPDIR)/moodle/blocks/marginalia/lang/en/help/
cp $(DB_FILES) $(ZIPDIR)/moodle/blocks/marginalia/db/
cp $(FORUM_FILES) $(ZIPDIR)/moodle/mod/forum/
- cp $(UTIL_FILES) $(ZIPDIR)/util/
- cp $(DOC_FILES) $(ZIPDIR)/doc/
cp $(README_FILES) $(ZIPDIR)

-$(VERSION_FILE): zipdir moodle.orig moodle18.orig moodle moodle18
$(UTIL_FILES) $(MARGINALIA_MOODLE_FILES) $(MARGINALIA_LIB_FILES)
$(MARGINALIA_LIB_3RDPARTY_FILES) $(MARGINALIA_PHP_FILES) $(FORUM_FILES)
$(LANG_FILES) $(HELP_FILES) $(DB_FILES)
- echo '<?php' >$@
- echo ' $$version = $(DATE)00;' >>$@
-
-$(ZIPDIR)/moodle19.patch: moodle.orig moodle
+# Do not auto make version file! It must be confirmed by hand.
+#$(VERSION_FILE): zipdir moodle.orig moodle moodle
$(MARGINALIA_MOODLE_FILES) $(MARGINALIA_LIB_FILES)
$(MARGINALIA_LIB_3RDPARTY_FILES) $(MARGINALIA_PHP_FILES) $(FORUM_FILES)
$(LANG_FILES) $(HELP_FILES) $(DB_FILES)
+version:
+ echo '<?php' >$(VERSION_FILE)
+ echo ' $$plugin->version = $(DATE)00;' >>$(VERSION_FILE)
+ echo ' $$plugin->requires = 2010112400;' >>$(VERSION_FILE)
+
+$(ZIPDIR)/marginalia-m.patch: moodle.orig moodle
mkdir -p $(ZIPDIR)
- -diff -Bbur -x .svn -x .DS_Store moodle.orig moodle
>$(ZIPDIR)/moodle19.patch
-
-$(ZIPDIR)/moodle18.patch: moodle18.orig moodle18
- mkdir -p $(ZIPDIR)
- -diff -Bbur -x .svn -x .DS_Store moodle18.orig moodle18
>$(ZIPDIR)/moodle18.patch
-
-%.txt: docs/%.html
- html2txt $< >$@
+ -diff -Bbur -x .svn -x .DS_Store moodle.orig moodle
>$(ZIPDIR)/marginalia-m.patch

clean-zip:
rm -r $(ZIPDIR)