forked from Xastir/Xastir
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathREADME.GIT
146 lines (106 loc) · 5.83 KB
/
README.GIT
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
Git Instructions:
-----------------
For those who think git might be a bit too complicated to deal with,
here are (I think) the minimal commands. See the "SUDO" section
below though for ideas on how to make updating Xastir even simpler.
Initial Git clone:
---------------------
0) Make sure git is installed on your system.
1) Run
git config --global user.name "Your Name" user.email "[email protected]"
This is not strictly necessary, but if you ever try to make changes
to Xastir and get them integrated with the project it is important.
NOTE: If you already have a different git global config, you can create
a local config for a particular repo by going into that repo and doing:
git config --local user.name "Your Name" user.email "[email protected]"
Check the config by: git config --local -l
2) Go to <http://github.com/Xastir/Xastir> to access the project page.
There you will find the URL of the git repository, just to the
right of a button that says "HTTPS". Copy this URL to your clipboard.
(At the time of this writing, the URL was
<https://github.com/Xastir/Xastir.git>)
3) Open a shell, navigate to a directory where you want to store
the Xastir source code, and enter this command:
git clone https://github.com/Xastir/Xastir.git
This will create a clone of the Xastir git repository in an
"Xastir" subdirectory of the current directory.
All done! You now have the latest development sources on your computer.
Not only that, you have a complete copy of the entire project history
and access to all prior releases.
Git Commands for Maintaining the Current Development Sources:
-------------------------------------------------------------
Once all this is in place, just cd into the "Xastir" directory at any
time, type "git pull". This will update your directory tree and
repository clone with the most recent code.
Then type "make install" in your build directory and you'll have the
latest development stuff installed on your system.
Here are the commands to do if you want a clean build of the latest
sources, and want configure to recheck all the libraries and header
files that Xastir needs:
cd Xastir
git pull
./bootstrap.sh
mkdir build
cd build
../configure
(make clean;make -j3 2>&1) | tee make.log
su
make install (make install-strip can be used after the first time,
it removes debugging info from executable)
chmod 4555 /usr/local/bin/xastir (only needed if using kernel AX.25)
exit (from root)
xastir
Note that you'll need autoconf 2.53 or newer and automake 1.6.3 or newer
in order to run the "./bootstrap.sh" script.
Checking out a branch:
------------------------------------------------
All branches associated with the Xastir project are contained in the clone
you made earlier. You can switch your current working directory to
one of those branches easily:
cd Xastir
git fetch (this updates your local repo copy from github, but doesn't
merge changes into your working tree)
git checkout <branch name> (this switches all the files in your working
tree to match those in the branch)
git merge (This makes sure that all the changes that
may have happened upstream on that branch
get into your copy)
You do not have to do this in a new directory --- so long as
you haven't changed any files in the source tree, git checkout
automatically swaps out all files it knows about with versions from the
branch.
If you really want to keep more than one branch's code around to work on,
you can do that if you have git version 2.5 or later with the following
commands:
cd Xastir
git worktree add <path> <branchname>
This will create a new directory tree called <path> with the named
branch checked out into it.
At the time of this writing there were only two branches in the Xastir
repository: master (the primary Xastir project) and "BRANCH_qt".
Checking out the Qt branch:
-----------------------------------------------------
There is only one non-default branch in the Xastir repository, for an
experimental Qt-based version of Xastir. It is called BRANCH_qt
You can check it out according to the instructions above.
Latest Qt status: The File->Exit and Interface->Interface Control portions work,
but none of the other menu options have been implemented. It will display raw
packets as they come in but there are no maps, symbols, etc. The networking is
both IPv4 and IPv6 compatible.
There are many more git commands and options. Many of them are more of
use to the developers. Some of those are listed below. The above should
be enough for most people to keep their copies in sync with the latest git
development sources.
Developer's git Instructions:
-----------------------------
Make sure you know how git works. Read https://git-scm.com/book/en/v2
If you are very familiar with CVS, get used to working differently, because
git is different.
Read and understand http://chris.beams.io/posts/git-commit/
Read http://justinhileman.info/article/changing-history/
Read http://think-like-a-git.net/
Branching and merging in git is very simple, and is documented very well
by all those links. We will not repeat it here.
------------------------------------------------------------------------
Copyright (C) 1999 Frank Giannandrea
Copyright (C) 2000-2016 The Xastir Group