I've installed Doxverilog 2.7 and also, downloaded source directories of Doxygen 1.8.1 from this website
https://github.com/ewa/doxverilog
The setup of doxygen is downloaded from:
http://sourceforge.net/projects/doxygen/files/
I'm using cygwin along with the installation of bison, flex, graphviz and qt5 packages on windows. I've also installed unxutills. I followed the general steps provided in the readme file of folder "doxverilog 2.7". When I run this command:
patch -F3 -p0 < linux.patch
then cygwin (run as administrator) displays different messages. The messages are provided below.
Messages:
user#user-PC /cygdrive/c/doxverilog-master/doxygen-1.8.1
$ patch -F3 -p0 < linux.patch
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: util.cpp
|===================================================================
|--- util.cpp (Revision 818)
|+++ util.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 52
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: doxygen_css.h
|===================================================================
|--- doxygen_css.h (Revision 818)
|+++ doxygen_css.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 67
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: navtree_js.h
|===================================================================
|--- navtree_js.h (Revision 818)
|+++ navtree_js.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 138
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: definition.cpp
|===================================================================
|--- definition.cpp (Revision 818)
|+++ definition.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 167
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: configoptions.cpp
|===================================================================
|--- configoptions.cpp (Revision 818)
|+++ configoptions.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 216
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: ftvhelp.cpp
|===================================================================
|--- ftvhelp.cpp (Revision 818)
|+++ ftvhelp.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
8 out of 8 hunks ignored
can't find file to patch at input line 481
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: vhdldocgen.h
|===================================================================
|--- vhdldocgen.h (Revision 818)
|+++ vhdldocgen.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 496
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: index.cpp
|===================================================================
|--- index.cpp (Revision 818)
|+++ index.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 537
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: memberdef.h
|===================================================================
|--- memberdef.h (Revision 818)
|+++ memberdef.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 560
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: definition.h
|===================================================================
|--- definition.h (Revision 818)
|+++ definition.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 593
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: vhdlparser.y
|===================================================================
|--- vhdlparser.y (Revision 818)
|+++ vhdlparser.y (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 615
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: vhdldocgen.cpp
|===================================================================
|--- vhdldocgen.cpp (Revision 818)
|+++ vhdldocgen.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 6945
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: filedef.cpp
|===================================================================
|--- filedef.cpp (Revision 818)
|+++ filedef.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 6989
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: image.cpp
|===================================================================
|--- image.cpp (Revision 818)
|+++ image.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 7049
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: doxygen.cpp
|===================================================================
|--- doxygen.cpp (Revision 818)
|+++ doxygen.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
7 out of 7 hunks ignored
can't find file to patch at input line 7124
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: config.l
|===================================================================
|--- config.l (Revision 818)
|+++ config.l (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 7179
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: util.h
|===================================================================
|--- util.h (Revision 818)
|+++ util.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7191
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: image.h
|===================================================================
|--- image.h (Revision 818)
|+++ image.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7204
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: classdef.cpp
|===================================================================
|--- classdef.cpp (Revision 818)
|+++ classdef.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
10 out of 10 hunks ignored
can't find file to patch at input line 7329
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: htmlgen.cpp
|===================================================================
|--- htmlgen.cpp (Revision 818)
|+++ htmlgen.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7364
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: types.h
|===================================================================
|--- types.h (Revision 818)
|+++ types.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7378
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: memberdef.cpp
|===================================================================
|--- memberdef.cpp (Revision 818)
|+++ memberdef.cpp (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
5 out of 5 hunks ignored
can't find file to patch at input line 7432
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: translator_en.h
|===================================================================
|--- translator_en.h (Revision 818)
|+++ translator_en.h (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7447
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: vhdlscanner.l
|===================================================================
|--- vhdlscanner.l (Revision 818)
|+++ vhdlscanner.l (Arbeitskopie)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
5 out of 5 hunks ignored
can't find file to patch at input line 7585
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: libdoxygen.pro.in
|===================================================================
|--- libdoxygen.pro.in 2011-08-03 12:28:25.000000000 +0100
|+++ libdoxygen.pro.in 2011-11-12 17:06:04.000000000 +0000
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 7625
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: libdoxygen.pro.in
|===================================================================
|--- libdoxygen.t 2011-08-03 12:37:56.000000000 +0200
|+++ libdoxygen.t 2011-11-12 17:06:04.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
When I run the following command after these messages.
sh configure
The following messages are displayed:
Messages:
Autodetected platform win32-g++...
Checking for GNU make tool... using /cygdrive/c/UnxUtils/usr/local/wbin/make
Checking for GNU install tool... using /usr/bin/install
Checking for dot (part of GraphViz)... using /usr/bin/dot
Checking for perl... using /usr/bin/perl
Checking for flex... using /usr/bin/flex
Checking for bison... using /usr/bin/bison
Creating VERSION file.
Created doxygen.spec file, for rpm generation.
Created Makefile from Makefile.in...
Created qtools/Makefile from qtools/Makefile.in...
Created src/Makefile from src/Makefile.in...
Created examples/Makefile from examples/Makefile.in...
Created doc/Makefile from doc/Makefile.in...
Created addon/doxywizard/Makefile from addon/doxywizard/Makefile.in...
Created addon/doxmlparser/src/Makefile from
addon/doxmlparser/src/Makefile.in...
Created addon/doxmlparser/test/Makefile from
addon/doxmlparser/test/Makefile.in...
Created addon/doxmlparser/examples/metrics/Makefile from
addon/doxmlparser/examples/metrics/Makefile.in...
Created libmd5/Makefile from libmd5/Makefile.in...
Created addon/doxyapp/Makefile from addon/doxyapp/Makefile.in...
Created qtools/qtools.pro from qtools/qtools.pro.in...
Created src/libdoxygen.pro from src/libdoxygen.pro.in...
Created src/libdoxycfg.pro from src/libdoxycfg.pro.in...
Created src/doxygen.pro from src/doxygen.pro.in...
Created addon/doxywizard/doxywizard.pro from
addon/doxywizard/doxywizard.pro.in...
Created addon/doxmlparser/src/doxmlparser.pro from
addon/doxmlparser/src/doxmlparser.pro.in...
Created addon/doxmlparser/test/xmlparse.pro from
addon/doxmlparser/test/xmlparse.pro.in...
Created addon/doxmlparser/examples/metrics/metrics.pro from
addon/doxmlparser/examples/metrics/metrics.pro.in...
Created libmd5/libmd5.pro from libmd5/libmd5.pro.in...
Created addon/doxyapp/doxyapp.pro from addon/doxyapp/doxyapp.pro.in...
Generating src/lang_cfg.h...
Now, when I run the following command
make all
the the following messages are dislayed:
Messages:
echo "char versionString[]=\"1.8.1\";" > src/version.cpp
/cygdrive/c/UnxUtils/usr/local/wbin/make -C qtools
process_begin: CreateProcess((null),
/cygdrive/c/UnxUtils/usr/local/wbin/make -C qtools, ...) failed.
make (e=2): The system cannot find the file specified.
C:\UnxUtils\usr\local\wbin\make.exe: *** [all] Error 2
Please help me in this problem.
Thank-you.
try
https://bitbucket.org/maddoxx/doxverilog
checkout branch 1810
read BUILD.txt!!!
run cmake -h
Related
How can I get GNU diff ignore the blank lines in the following example?
File a:
x
do
done
File b:
x
do
done
Neither file has trailing white spaces in any line.
Using GNU diff 3.1 on Mac OS X I get:
diff -w a b
2d1
< do
3a3
> do
Same when I add various promising looking options:
diff --suppress-blank-empty -E -b -w -B -I '^[[:space:]]*$' --strip-trailing-cr -i a b
2d1
< do
3a3
> do
What am I missing here?
diff --version
diff (GNU diffutils) 3.1
I think the problem here is that diff is seeing do as being removed from the first file, and added to the second, maybe because there isn't enough context around the change.
If you reverse the order of the files as arguments, diff reports that the space is added and removed, and will then ignore it with --ignore-blanks-lines.
Looking at it as a unified diff, this is a little more clear:
$ diff test.txt test2.txt -u
--- test.txt 2015-10-20 10:50:52.585167600 -0700
+++ test2.txt 2015-10-20 10:51:01.042167600 -0700
## -1,4 +1,4 ##
x
-do
+do
done
prp#QW7PRP09-14 ~/temp
$ diff test2.txt test.txt -u
--- test2.txt 2015-10-20 10:51:01.042167600 -0700
+++ test.txt 2015-10-20 10:50:52.585167600 -0700
## -1,4 +1,4 ##
x
-
do
+
done
And the result with the --ignore-blank-lines, and the order switched:
prp#QW7PRP09-14 ~/temp
$ diff test2.txt test.txt -B -u
I want to split a large text database (~10 million lines). I can use a command like
$ sed -i -e '4 s/(dB)//' -e '4 s/Best\ unit/Best_Unit/' -e '1,3 d' '/cygdrive/c/ Radio Mobile/Output/TRC_TestProcess/trc_longlands.txt'
$ split -l 1000000 /cygdrive/P/2012/Job_044_DM_Radio_Propogation/Working/FinalPropogation/TRC_Longlands/trc_longlands.txt 1
The first line is to clean the databse and the next is to split it -
but then the output files do not have the field names. How can I incorporate the field names into each dataset and pipe a list which has the original file, new file name and line numbers (from original file) in it. This is so that it can be used in the arcgis model to re-join the final simplified polygon datasets.
ALTERNATIVELY AND MORE USEFULLY -as this needs to go into a arcgis model, a python based solution is best. More details are in https://gis.stackexchange.com/questions/21420/large-point-to-polygon-by-buffer-join-buffer-dissolve-issues#comment29062_21420 and Remove specific lines from a large text file in python
SO GOING WITH A CYGWIN based Python solution as per answer by icyrock.com
we have process_text.sh
cd /cygdrive/P/2012/Job_044_DM_Radio_Propogation/Working/FinalPropogation/TRC_Longlands
mkdir processing
cp trc_longlands.txt processing/trc_longlands.txt
cd txt_processing
sed -i -e '4 s/(dB)//' -e '4 s/Best\ unit/Best_Unit/' -e '1,3 d' 'trc_longlands.txt'
split -l 1000000 trc_longlands.txt trc_longlands_
cat > a
h
1
2
3
4
5
6
7
8
9
^D
split -l 3
split -l 3 a 1
mv 1aa 21aa
for i in 1*; do head -n1 21aa|cat - $i > 2$i; done
for i in 21*; do echo ---- $i; cat $i; done
how can "TRC_Longlands" and the path be replaced with the input filename -in python we have %path%/%name for this.
in the last line is "do echo" necessary?
and this is called by python using
import os
os.system("process_text.bat")
where process_text.bat is basically
bash process_text.sh
I get the following error when run from dos...
Microsoft Windows [Version 6.1.7601] Copyright (c) 2009 Microsoft
Corporation. All rights reserved.
C:\Users\georgec>bash
P:\2012\Job_044_DM_Radio_Propogation\Working\FinalPropogat
ion\TRC_Longlands\process_text.sh 'bash' is not recognized as an
internal or external command, operable program or batch file.
also when I run the bash command from cygwin -I get
georgec#ATGIS25
/cygdrive/P/2012/Job_044_DM_Radio_Propogation/Working/FinalPropogation/TRC_Longlands
$ bash process_text.sh : No such file or directory:
/cygdrive/P/2012/Job_044_DM_Radio_Propogation/Working/FinalPropogation/TRC_Longlands
cp: cannot create regular file `processing/trc_longlands.txt\r': No
such file or directory : No such file or directory: txt_processing :
No such file or directoryds.txt
but the files are created in the root directory.
why is there a "." after the directory name? how can they be given a .txt extension?
If you want to just prepend the first line of the original file to all but the first of the splits, you can do something like:
$ cat > a
h
1
2
3
4
5
6
7
^D
$ split -l 3
$ split -l 3 a 1
$ ls
1aa 1ab 1ac a
$ mv 1aa 21aa
$ for i in 1*; do head -n1 21aa|cat - $i > 2$i; done
$ for i in 21*; do echo ---- $i; cat $i; done
---- 21aa
h
1
2
---- 21ab
h
3
4
5
---- 21ac
h
6
7
Obviously, the first file will have one line less then the middle parts and the last part might be shorter, too, but if that's not a problem, this should work just fine. Of course, if your header has more lines, just change head -n1 to head -nX, X being the number of header lines.
Hope this helps.
Hey I am using bazaar for my code, I wanna show the history of changes to a specific file, instead of showing changes to the whole bazaar repo. How could I do it?
bzr blame <filename> will show you which lines were introduced with which changes:
$ bzr blame Makefile
548 steve-b | #
| #
861 steve-b | OVERRIDE_TARBALL=yes
548 steve-b |
| include common/Make.rules
|
| DIRS=parser \
| profiles \
| utils \
| changehat/libapparmor \
| changehat/mod_apparmor \
| changehat/pam_apparmor \
| tests
If you just want the commit messages, bzr log <filename> will show you:
$ bzr log Makefile
------------------------------------------------------------
revno: 1828
tags: apparmor_2.7.0-beta2
committer: John Johansen <john.johansen#canonical.com>
branch nick: apparmor
timestamp: Thu 2011-09-15 13:28:01 -0700
message:
Remove extra space insert at from of ${TAG_VERSION} when doing the ~ to -
substitution.
Signed-off-by: John Johansen <john.johansen#canonical.com>
------------------------------------------------------------
revno: 1734
committer: Steve Beattie <sbeattie#ubuntu.com>
branch nick: apparmor
timestamp: Thu 2011-06-02 18:54:56 -0700
message:
This patch adjusts the tag make target to use a separate version with
'~' replaced by '-'. This is needed for mirroring to git as git can't
handle '~'s embedded in tag or branch names.
Tested by setting up a separate tag_version target like so:
tag_version:
echo ${TAG_VERSION}
...
bzr log is the key.
Purpose: Show historical log for a branch or subset of a branch.
Usage: bzr log [FILE...]
If you use a gui (TortoiseBzr of BzrExplorer), select the file and clic on log command.
I'm trying to create a patch using diff, but I can't get the patch to use the line end characters used in the files when creating a new file or to change the line ending when the file changes it. Basically, I'm doing:
cp -r dir1 dir3
diff -ruN dir1 dir2 > dir3\patch.txt
cd dir3
patch -p1 < patch.txt
All the changes between dir1 and dir2 properly apply, except the end of line character for new files is defaulting to CR+LF, even where the file in dir2 uses LF as an end of line marker. Also, any files where the difference between them is just a line end change are not patched in any way -- diff doesn't seem to see any change.
So running diff -rq dir2 dir3 gives a bunch of Files aaa and bbb differ, but diff -rwq dir2 dir3 works fine.
I'm using diff - GNU diffutils version 2.7 and patch 2.5 from UnxUtils on Windows XP.
Is there any way to make new and changed files included in the patch keep the line ending from the original file?
This works:
cp -r dir1 dir3
diff --binary -ruN dir1 dir2 > dir3\patch.txt
cd dir3
patch --no-backup-if-mismatch --binary -u -p1 < patch.txt
Not using the --binary flag means that the file is parsed line by line, ignoring EOL. For some reason, it won't always patch cleanly (gives a Hunk #1 succeeded at 1 with fuzz 1. message) so I had to include --no-backup-if-mismatch to prevent it making .orig files. The -u seems to be optional, since patch will figure the patch type out on it's own.
I've noticed this strange behavior of diff and patch when I've used them to force one code base to be identical to another. Let's say I want to update update_me to look identical to leave_unchanged. I go to update_me. I run a diff from leave_unchanged to update_me. Then I patch the diff into update_me. If there are new files in leave_unchanged, patch asks me if my patch was reversed! If I answer yes, it deletes the new files in leave_unchanged. Then, if I simply re-run the patch, it correctly patches update_me.
Why does patch try to modify both leave_unchanged and update_me?
What's the proper way to do this? I found a hacky way which is to replace all +++ lines with nonsense paths so patch can't find leave_unchanged. Then it works fine. It's such an ugly solution though.
$ mkdir copyfrom
$ mkdir copyto
$ echo "Hello world" > copyfrom/myFile.txt
$ cd copyto
$ diff -Naur . ../copyfrom > my.diff
$ less my.diff
diff -Naur ./myFile.txt ../copyfrom/myFile.txt
--- ./myFile.txt 1969-12-31 19:00:00.000000000 -0500
+++ ../copyfrom/myFile.txt 2010-03-15 17:21:22.000000000 -0400
## -0,0 +1 ##
+Hello world
$ patch -p0 < my.diff
The next patch would create the file ../copyfrom/myFile.txt,
which already exists! Assume -R? [n] yes
patching file ../copyfrom/myFile.txt
$ patch -p0 < my.diff
patching file ./myFile.txt
Edit
I noticed that Mercurial avoids this problem by pre-pending "a" and "b" directories.
$ hg diff
--- a/crowdsourcing/models.py Mon Jun 14 17:18:46 2010 -0400
+++ b/crowdsourcing/models.py Thu Jun 17 11:08:42 2010 -0400
...
I believe the answer here is to execute your diff at the parent directory. Then use patch -p1 to strip this first segment. I believe this is why the strip option of patch actually defaults to 1 rather than 0. E.g. to use your example from above
$ mkdir copyfrom
$ mkdir copyto
$ echo "Hello world" > copyfrom/myFile.txt
$ diff -Naur copyto copyfrom > my.diff
$ less my.diff
diff -Naur copyto/myFile.txt copyfrom/myFile.txt
--- copyto/myFile.txt 1970-01-01 12:00:00.000000000 +1200
+++ copyfrom/myFile.txt 2010-10-19 10:03:43.000000000 +1300
## -0,0 +1 ##
+Hello world
$ cd copyto
$ patch -p1 < ../my.diff
The only difference from your example is that I've executed the diff from the parent directory so that the directories being compared are at the same level.