Merge upstream changes

2016-01-27 14:36:41 +08:00
parent b75ce44424 495ce0e4fb
commit 42110464c9
62 changed files with 545 additions and 131 deletions
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -20,17 +19,29 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch

-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject

 # JDT-specific (Eclipse Java Development Tools)
 .classpath

-# PDT-specific
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
 .buildpath

 # sbteclipse plugin
 .target

+# Tern plugin
+.tern-project
+
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
--- a/Global/EiffelStudio.gitignore
+++ b/Global/EiffelStudio.gitignore
@@ -1,2 +1,2 @@
-# The compilation directoy
+# The compilation directory
 EIFGENs
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -30,3 +30,6 @@ tramp

 # cask packages
 .cask/
+
+# server auth directory
+/server/
--- a/Global/GPG.gitignore
+++ b/Global/GPG.gitignore
@@ -0,0 +1,2 @@
+secring.*
+
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference https://intellij-support.jetbrains.com/entries/23393067

 # User-specific stuff:
@@ -38,3 +38,4 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+fabric.properties
--- a/Global/Lazarus.gitignore
+++ b/Global/Lazarus.gitignore
@@ -1,15 +1,30 @@
-#ignore backup files
-backup/
-
-#ignore files generated by the compiler
-lib/
+# Lazarus compiler-generated binaries (safe to delete)
+*.exe
+*.dll
+*.so
+*.dylib
+*.lrs
+*.res
 *.compiled
+*.dbg
+*.ppu
 *.o
 *.or
-*.ppu
+*.a

-#ignore debug information files
-*.dbg
+# Lazarus autogenerated files (duplicated info)
+*.rst
+*.rsj
+*.lrt

-#exclude executable output in windows
-*.exe
+# Lazarus local files (user-specific info)
+*.lps
+
+# Lazarus backups and unit output folders.
+# These can be changed by user in Lazarus/project options.
+backup/
+*.bak
+lib/
+
+# Application bundle for Mac OS
+*.app/
--- a/Global/Linux.gitignore
+++ b/Global/Linux.gitignore
@@ -1,5 +1,8 @@
 *~

+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
 # KDE directory preferences
 .directory

--- a/Global/Mercurial.gitignore
+++ b/Global/Mercurial.gitignore
@@ -1,3 +1,6 @@
-/.hg/*
-*/.hg/*
+.hg/
 .hgignore
+.hgsigs
+.hgsub
+.hgsubstate
+.hgtags
--- a/Global/MicrosoftOffice.gitignore
+++ b/Global/MicrosoftOffice.gitignore
@@ -8,3 +8,6 @@

 # Excel Backup File
 *.xlk
+
+# PowerPoint temporary
+~$*.ppt*
--- a/Global/NetBeans.gitignore
+++ b/Global/NetBeans.gitignore
@@ -4,5 +4,4 @@ nbbuild/
 dist/
 nbdist/
 nbactions.xml
-nb-configuration.xml
 .nb-gradle/
--- a/Global/Otto.gitignore
+++ b/Global/Otto.gitignore
@@ -0,0 +1 @@
+.otto/
--- a/Global/SynopsysVCS.gitignore
+++ b/Global/SynopsysVCS.gitignore
@@ -1,23 +1,36 @@
-# Waveforms
-*.vpd
+# Waveform formats
 *.vcd
+*.vpd
 *.evcd
+*.fsdb

-# Binary files
+# Default name of the simulation executable.  A different name can be 
+# specified with this switch (the associated daidir database name is 
+# also taken from here):  -o <path>/<filename>
 simv

-# Directories used for compilation
-csrc/
+# Generated for Verilog and VHDL top configs
 simv.daidir/
+simv.db.dir/

-# Log files
+# Infrastructure necessary to co-simulate SystemC models with 
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
+
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
 *.log

-# DVE, UCLI related files
-DVEfiles/
-ucli*
-*.key
-
-# Coverage related files
+# Coverage results (generated with urg) and database location.  The 
+# following switch can also be used:  urg -dir <coverage_directory>.vdb
 simv.vdb/
 urgReport/
+
+# DVE and UCLI related files.
+DVEfiles/
+ucli.key
+
+# When the design is elaborated for DirectC, the following file is created
+# with declarations for C/C++ functions.
+vc_hdrs.h
--- a/Global/Tags.gitignore
+++ b/Global/Tags.gitignore
@@ -1,7 +1,9 @@
 # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
+.TAGS
 !TAGS/
 tags
+.tags
 !tags/
 gtags.files
 GTAGS
--- a/Global/Vim.gitignore
+++ b/Global/Vim.gitignore
@@ -1,6 +1,10 @@
+# swap
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
+# persistent undo 
 *.un~
+# session
 Session.vim
+# temporary
 .netrwhist
 *~
--- a/Global/VirtualEnv.gitignore
+++ b/Global/VirtualEnv.gitignore
@@ -4,6 +4,9 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ib64
+[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
+.venv
 pip-selfcheck.json
--- a/Global/VisualStudioCode.gitignore
+++ b/Global/VisualStudioCode.gitignore
@@ -0,0 +1,2 @@
+.vscode
+
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -1,4 +1,12 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -7,8 +15,9 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
+xcuserdata/
+
+## Other
 *.moved-aside
-DerivedData
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
--- a/Global/XilinxISE.gitignore
+++ b/Global/XilinxISE.gitignore
@@ -42,6 +42,16 @@
 *_usage.xml
 *_xst.xrpt

+# iMPACT generated files
+_impactbatch.log
+impact.xsl
+impact_impact.xwbt
+ise_impact.cmd
+webtalk_impact.xml
+
+# Core Generator generated files
+xaw2verilog.log
+
 # project-wide generated files
 *.gise
 par_usage_statistics.html