[smc-discuss] [smc/fonts][master] Update submodules

[Santhosh Thottingal]

Santhosh Thottingal pushed to master at SMC / fonts


Commits:
d4a0c56f by Santhosh Thottingal at 2015-04-12T10:40:12Z
Update submodules

- - - - -


11 changed files:

- AnjaliOldLipi
- Chilanka
- Dyuthi
- Kalyani
- Karumbi
- Keraleeyam
- Makefile
- Meera
- Rachana
- RaghuMalayalamSans
- Suruma


Changes:

=====================================
AnjaliOldLipi
=====================================
--- a/AnjaliOldLipi
+++ b/AnjaliOldLipi
@@ -1 +1 @@
-Subproject commit 8fa90180075f3117f2651a2c18c541c27bce1ea1
+Subproject commit c467bf6a2aad97b5244150f1463060243cbb6a97

=====================================
Chilanka
=====================================
--- a/Chilanka
+++ b/Chilanka
@@ -1 +1 @@
-Subproject commit 002c77b09f1960b2643d7f31cb2588de13b27b14
+Subproject commit 861a854965740fa91010fd40be4349321a1c71ed

=====================================
Dyuthi
=====================================
--- a/Dyuthi
+++ b/Dyuthi
@@ -1 +1 @@
-Subproject commit 7ba14b00907fe62d472a44e803c7e9ca72eea1ad
+Subproject commit c246ee9a95cf0fb5d7920c316b1f085e945ee2a4

=====================================
Kalyani
=====================================
--- a/Kalyani
+++ b/Kalyani
@@ -1 +1 @@
-Subproject commit aed4d6bac731608368aa0554344b9939631feeb5
+Subproject commit 33e0fe38acc822d3e0cc59835b4364293c0565f4

=====================================
Karumbi
=====================================
--- a/Karumbi
+++ b/Karumbi
@@ -1 +1 @@
-Subproject commit 924fe0fb6b88357b7323ee7952f4f00157ddc375
+Subproject commit aa45d4cc17aa0297714686dd09d19ef2ca5b5580

=====================================
Keraleeyam
=====================================
--- a/Keraleeyam
+++ b/Keraleeyam
@@ -1 +1 @@
-Subproject commit 804fd908dd6971db45ebd46878b760d59d73dbe7
+Subproject commit 4abe5db6aae897e022b2955235bb2f92e9549593

=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,24 @@ fonts=AnjaliOldLipi Chilanka Dyuthi Kalyani Keraleeyam Meera Rachana RaghuMalaya
 version = 6.1
 
 default: clean compile
-all: clean compile test webfonts
+all: clean
+
+all:
+# generate ttf files from sfd files
+	@for font in `echo ${fonts}`;do \
+		 $(MAKE) -C $$font all;\
+	done;
 
 compile:
 # generate ttf files from sfd files
 	@for font in `echo ${fonts}`;do \
-		fontforge -lang=ff -c "Open('$${font}/$${font}.sfd'); Generate('$${font}/$${font}.ttf')"; \
+		 $(MAKE) -C $$font compile;\
 	done;
 
 install: compile
 # copy ttf files to system font directory
 	@for font in `echo ${fonts}`;do \
-		install -D -m 0644  $${font}/$${font}.ttf \
-			${DESTDIR}/${fontpath}/$${font}.ttf;\
+		 $(MAKE) -C $$font install;\
 	done;
 
 # copy fontconfig configuration files to system fontconfig
@@ -35,9 +40,7 @@ install: compile
 uninstall:
 # remove fonts from system font directories
 	@for font in `echo ${fonts}`;do \
-		if [ -f ${DESTDIR}/${fontpath}/$${font}.ttf ]; then\
-			rm -f ${DESTDIR}/${fontpath}/$${font}.ttf;\
-		fi \
+		 $(MAKE) -C $$font uninstall;\
 	done;
 
 # remove fontconfig configuration files from system fontconfig
@@ -56,11 +59,6 @@ uninstall:
 
 clean:
 # remove ttf fonts
-	@for font in `echo ${fonts}`;do \
-		if [ -f $${font}/$${font}.ttf ];then\
-			rm -f $${font}/$${font}.ttf;\
-		fi \
-	done;
 	@rm -rf tests/*.pdf webfonts sdist ignore-file;
 
 test: compile
@@ -74,13 +72,16 @@ test: compile
 webfonts: compile
 	@echo "Generating webfonts"
 	@for font in `echo ${fonts}`;do \
-		mkdir -p webfonts/$${font}; \
-		sfntly -w $${font}/$${font}.ttf\
-			webfonts/$${font}/$${font}.woff; \
-		sfntly -e -x $${font}/$${font}.ttf\
-		 webfonts/$${font}/$${font}.eot; \
-		echo "Webfonts generated for $${font}"; \
+		$(MAKE) -C $$font webfonts;\
 	done
+
+pull:
+#Update all submodules by pulling from remotes
+	git submodule foreach git checkout master
+	git submodule foreach git pull origin master
+push:
+	git submodule foreach git push origin master
+
 sdist: $(fonts) ChangeLog Makefile generate.pe malayalam-fonts.conf
 	echo ".git\nignore-file" > ignore-file
 	tar --owner root --group root --mode a+rX \

=====================================
Meera
=====================================
--- a/Meera
+++ b/Meera
@@ -1 +1 @@
-Subproject commit 8bdc0a8cdbfa72874bf7818f8b01d917c80d050f
+Subproject commit 61ef33ae42be24870b0f40c4679cc53bea0cb708

=====================================
Rachana
=====================================
--- a/Rachana
+++ b/Rachana
@@ -1 +1 @@
-Subproject commit 8e1e7c4e69ca4968c361c5863a99167f3a286c26
+Subproject commit 06332b4e17ca129fe1ed69d8015ccb405b4f0bae

=====================================
RaghuMalayalamSans
=====================================
--- a/RaghuMalayalamSans
+++ b/RaghuMalayalamSans
@@ -1 +1 @@
-Subproject commit fc6db2896b68152e986a0b966610d49a0558c2b4
+Subproject commit 86c5a2ea10813655281d5164eaff335df021c79d

=====================================
Suruma
=====================================
--- a/Suruma
+++ b/Suruma
@@ -1 +1 @@
-Subproject commit c7f5fcbedb10c292f7eceb233d87a4a84b294960
+Subproject commit f40136797723f3cdc804273da042940ff58b0460


View it on GitLab: https://gitlab.com/smc/fonts/commit/d4a0c56f5aa5ca6c597fe7af5c8e440359aeae3b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.smc.org.in/pipermail/discuss-smc.org.in/attachments/20150412/17df88fe/attachment.html>