Commits

Anonymous committed 66238dd

Created a common directory for files that are common to both t2 and vipe.

Comments (0)

Files changed (25)

 
 T2_IMAGES_DEST = $(patsubst t2/%,$(T2_DEST)/%,$(T2_IMAGES))
 
+T2_COMMON_IMAGES_DEST = $(patsubst common/%,$(T2_DEST)/%,$(COMMON_IMAGES))
+
+T2_COMMON_DIRS_DEST = $(patsubst common/%,$(T2_DEST)/%,$(COMMON_DIRS))
+
+
+
 # vipe macros
 
 VIPE_DEST_BASE = /var/www/html/shlomi/
 
 VIPE_IMAGES_DEST = $(patsubst vipe/%,$(VIPE_DEST)/%,$(VIPE_IMAGES))
 
-T2_TARGETS = $(T2_DIRS_DEST) $(T2_DOCS_DEST) $(T2_DEST)/style.css $(T2_IMAGES_DEST)
+VIPE_COMMON_IMAGES_DEST = $(patsubst common/%,$(VIPE_DEST)/%,$(COMMON_IMAGES))
 
-VIPE_TARGETS = $(VIPE_DIRS_DEST) $(VIPE_DOCS_DEST) $(VIPE_DEST)/style.css $(VIPE_IMAGES_DEST)
+VIPE_COMMON_DIRS_DEST = $(patsubst common/%,$(VIPE_DEST)/%,$(COMMON_DIRS))
 
+T2_TARGETS = $(T2_DIRS_DEST) $(T2_DOCS_DEST) $(T2_COMMON_IMAGES_DEST) $(T2_IMAGES_DEST) $(T2_COMMON_DIRS_DEST)
+
+VIPE_TARGETS = $(VIPE_DIRS_DEST) $(VIPE_DOCS_DEST) $(VIPE_COMMON_IMAGES_DEST) $(VIPE_IMAGES_DEST) $(VIPE_COMMON_DIRS_DEST)
 
 all: $(T2_TARGETS) $(VIPE_TARGETS)
 #all: $(T2_DIRS_DEST) $(T2_DOCS_DEST) 
 $(T2_IMAGES_DEST) :: $(T2_DEST)/% : t2/%
 	cp -f $< $@
 
-$(T2_DEST)/style.css : style.css
+$(T2_COMMON_IMAGES_DEST) :: $(T2_DEST)/% : common/%
 	cp -f $< $@
 
+$(T2_COMMON_DIRS_DEST) :: $(T2_DEST)/% : unchanged
+	mkdir -p $@
+	touch $@
+
+
 # vipe targets
 
 $(VIPE_DOCS_DEST) :: $(VIPE_DEST)/% : vipe/%.wml template.wml vipe/.wmlrc
 $(VIPE_IMAGES_DEST) :: $(VIPE_DEST)/% : vipe/%
 	cp -f $< $@
 
-$(VIPE_DEST)/style.css : style.css
+$(VIPE_COMMON_IMAGES_DEST) :: $(VIPE_DEST)/% : common/%
 	cp -f $< $@
 
+$(VIPE_COMMON_DIRS_DEST) :: $(VIPE_DEST)/% : unchanged
+	mkdir -p $@
+	touch $@
+
 t2/SFresume.html.wml : t2/SFresume_base.wml
 	touch $@
 

common/images/bk2hp.png

Added
New image

common/images/bk2hp_no_trnprnt.gif

Added
New image

common/images/logo-wml.png

Added
New image

common/images/noIE.png

Added
New image

common/images/shlomif_bak.gif

Added
New image
+a:hover, img.highlight:hover { background-color : LightGreen }
+td.navbar 
+{ 
+    background-color: moccasin;  
+    width : 20%;
+    padding-right : 1em;
+}
+p.desc { margin-left : 3em }
+ul.navbarmain { padding-left : 1em ; margin-left : 1em }
+ul.navbarnested { padding-left : 0em ; margin-left : 2em }
+h3.newsitem { text-indent: 3em }
+p.newsitem { margin-left : 6em }
+div.indent { margin-left : 3em }
+p.indent { margin-left : 3em  }
+div.rightalign { text-align : right }
+/*
+    Make sure the links inside the navigation bar are highlited
+    with a different colour. That's CSS 2.
+    http://www.zvon.org/xxl/CSS2Tutorial/Examples/example3.html
+*/
+
+table.shlomif { border-width : 1 ; border-color : black }
+table.shlomif td { vertical-align : top ; align : left }
+td.main 
+{
+    padding-left : 1em;
+}
+ul.noindent { margin-left : 0em }
+div.center { text-align: center }
+table.center { margin-left : auto ; margin-right : auto }
+table.cv { width : 100% ; border : none ; }
+table.cv td { vertical-align : top }
     echo "${upper_host}_IMAGES = " $(find $host -type f -not -name '*.wml' -not -name '.*' | grep -v '/\.svn' | grep -v '~$')
     newline
 done;
+
+echo "COMMON_IMAGES = " $(find common -type f -not -name '*.wml' -not -name '.*' | grep -v '/\.svn' | grep -v '~$')
+newline
+echo "COMMON_DIRS = " $(find common -type d | grep -v '/\.svn' | grep -v '^\.svn' | tail +2)
+
 ) >> "$file"
+

old/images/back1.gif

Added
New image

old/images/shlomif.gif

Added
New image

style.css

-a:hover, img.highlight:hover { background-color : LightGreen }
-td.navbar 
-{ 
-    background-color: moccasin;  
-    width : 20%;
-    padding-right : 1em;
-}
-p.desc { margin-left : 3em }
-ul.navbarmain { padding-left : 1em ; margin-left : 1em }
-ul.navbarnested { padding-left : 0em ; margin-left : 2em }
-h3.newsitem { text-indent: 3em }
-p.newsitem { margin-left : 6em }
-div.indent { margin-left : 3em }
-p.indent { margin-left : 3em  }
-div.rightalign { text-align : right }
-/*
-    Make sure the links inside the navigation bar are highlited
-    with a different colour. That's CSS 2.
-    http://www.zvon.org/xxl/CSS2Tutorial/Examples/example3.html
-*/
-
-table.shlomif { border-width : 1 ; border-color : black }
-table.shlomif td { vertical-align : top ; align : left }
-td.main 
-{
-    padding-left : 1em;
-}
-ul.noindent { margin-left : 0em }
-div.center { text-align: center }
-table.center { margin-left : auto ; margin-right : auto }
-table.cv { width : 100% ; border : none ; }
-table.cv td { vertical-align : top }

t2/images/back1.gif

Removed
Old image

t2/images/bk2hp.png

Removed
Old image

t2/images/bk2hp_no_trnprnt.gif

Removed
Old image

t2/images/logo-wml.png

Removed
Old image

t2/images/noIE.png

Removed
Old image

t2/images/shlomif.gif

Removed
Old image

t2/images/shlomif_bak.gif

Removed
Old image

vipe/images/back1.gif

Removed
Old image

vipe/images/bk2hp.png

Removed
Old image

vipe/images/bk2hp_no_trnprnt.gif

Removed
Old image

vipe/images/logo-wml.png

Removed
Old image

vipe/images/noIE.png

Removed
Old image

vipe/images/shlomif.gif

Removed
Old image

vipe/images/shlomif_bak.gif

Removed
Old image