Updated proj files and gitignore

.gitignore

@@ -21,47 +21,39 @@ sdk/**/*Release
 sdk/**/*webtalk
 sdk/.sdk
 sdk/*.log
-
 # ignore everything in the hw_platform
 sdk/*hw_platform*/*
 # except
 !sdk/*hw_platform*/*.hdf
 !sdk/*hw_platform*/.*project
-
 # ignore everything in the BSP
 sdk/*_bsp*/*
 # except
 !sdk/*_bsp*/system.mss
 !sdk/*_bsp*/Makefile
 !sdk/*_bsp*/.*project
-
 # include the relevant elf files
 !sdk/**/*Debug/*.elf
 !sdk/**/*Debug/*.elf.size
 
-# Make sure we keep only xci files in repo ip src subfolder
-repo/*/ip/*/src/*/*
-# Ignore 'generated_ip' directory inside repo/ip
-repo/*/ip/*/generated_ip
-!repo/*/ip/*/src/*/
-!repo/*/ip/*/src/*/*.xci
-!repo/*/ip/*/src/*/*.patch
-!repo/*/ip/*/src/*/*.tcl
+repo/**
+# whitelist vivado-library if it exists
+!repo/vivado-library
+#do not white-list submodule contents
+!repo/local
+!repo/local/**
+!repo/cache
+repo/cache/**
 
 # Make sure we keep only xci files in ip src subfolder
 src/ip/*/**
 !src/ip/*/*.xci
 !src/ip/*/*.prj
-
 # Do not ignore anything in src/others
 !src/others/*
-
 # Do not ignore block diagram files
 !src/bd/**
 
-# Do not ignore cached IP blocks (under test for potential runtime performance gains)
-!repo/cache
-repo/cache/**
 
 # ignore everything in project folder
 proj/*
@@ -72,4 +64,4 @@ proj/*
 !proj/release.py
 
 # keep the empty folders
-!/**/.keep
+!**/.keep

proj/cleanup.cmd

@@ -11,6 +11,7 @@ rem mark read only those we wish to keep
 attrib +R .\create_project.tcl
 attrib +R .\cleanup.sh
 attrib +R .\cleanup.cmd
+attrib +R .\release.py
 attrib +R .\.gitignore
 attrib +R .\_READ_ME_.txt
 

proj/cleanup.sh

@@ -11,5 +11,6 @@ find . -mindepth 1 -type d -exec rm -rf {} +
 find . -type f ! -name 'cleanup.sh' \
                ! -name 'cleanup.cmd' \
                ! -name 'create_project.tcl' \
+               ! -name 'release.py' \
                ! -name '.gitignore' \
                -exec rm -rf {} +

proj/release.py

@@ -10,6 +10,7 @@
 
 	Updated:
 		03/10/2017: added Debug file to zipped folders/files
+		05/12/2017(ArtVVB): added full /local inclusion in /repo
 """
 
 import fnmatch
@@ -48,9 +49,7 @@ def main(dest):
 				subdirs[:] = [] # just skip everything else in cache
 			else:
 				for filename in files:
-					if (fnmatch.fnmatch(filename, "*.xci") or fnmatch.fnmatch(filename, "*.patch")\
-					or fnmatch.fnmatch(filename, "*.tcl")):
-						zip(filename, dirname, projname, abs_src, zf)
+					zip(filename, dirname, projname, abs_src, zf) # keep contents of all other subdirectories (local, vivado-library usually)
 
 	if os.path.isdir("sdk"): # system.mss, Makefile, .*project and .hdf files are to be zipped, and specific folders ignored
 		for dirname, subdirs, files in os.walk(os.path.join(abs_src, "sdk")):