Skip to content

Commit d9200f8

Browse files
committed
test_kit moved to sources directory with it's own Makefiles. compile_me.sh scripts removed.
1 parent a219fe8 commit d9200f8

24 files changed

+209
-86
lines changed

.gitignore

+37-47
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,42 @@
1-
sources/COPYING
2-
sources/INSTALL
3-
sources/Makefile
4-
sources/Makefile.in
5-
sources/aclocal.m4
6-
sources/autom4te.cache/
7-
sources/config.guess
8-
sources/config.log
9-
sources/config.status
10-
sources/config.sub
11-
sources/configure
12-
sources/depcomp
13-
sources/install-sh
14-
sources/libjalali/.deps/
15-
sources/libjalali/.libs/
16-
sources/libjalali/Makefile
17-
sources/libjalali/Makefile.in
18-
sources/libjalali/jalali.lo
19-
sources/libjalali/jalali.o
20-
sources/libjalali/jtime.lo
21-
sources/libjalali/jtime.o
22-
sources/libjalali/libjalali.la
23-
sources/libtool
24-
sources/ltmain.sh
25-
sources/m4/
26-
sources/man/Makefile
27-
sources/man/Makefile.in
28-
sources/missing
29-
sources/src/.deps/
30-
sources/src/.libs/
31-
sources/src/Makefile
32-
sources/src/Makefile.in
331
sources/src/jcal
342
sources/src/jdate
35-
sources/src/jcal.o
36-
sources/src/jdate.o
37-
test_kit/elc
38-
test_kit/get_date
39-
test_kit/get_diff
40-
test_kit/jtime/asctime
41-
test_kit/jtime/ctime
42-
test_kit/jtime/gmtime
43-
test_kit/jtime/jstrftime
44-
test_kit/jtime/jstrptime
45-
test_kit/jtime/localtime
46-
test_kit/jtime/mktime
47-
test_kit/jyinfo
48-
test_kit/leap
49-
test_kit/sec_converter
3+
sources/test_kit/jalali/elc
4+
sources/test_kit/jalali/get_date
5+
sources/test_kit/jalali/get_diff
6+
sources/test_kit/jalali/jyinfo
7+
sources/test_kit/jalali/leap
8+
sources/test_kit/jalali/sec_converter
9+
sources/test_kit/jalali/jalali_update
10+
sources/test_kit/jtime/jasctime
11+
sources/test_kit/jtime/jctime
12+
sources/test_kit/jtime/jgmtime
13+
sources/test_kit/jtime/jstrftime
14+
sources/test_kit/jtime/jstrptime
15+
sources/test_kit/jtime/jlocaltime
16+
sources/test_kit/jtime/jmktime
17+
Makefile.in
18+
Makefile
19+
COPYING
20+
INSTALL
21+
aclocal.m4
22+
autom4te.cache
23+
config.guess
24+
config.log
25+
config.status
26+
config.sub
27+
configure
28+
depcomp
29+
install-sh
30+
missing
31+
ltmain.sh
32+
libtool
33+
*.la
34+
*.o
35+
*.lo
36+
.libs
37+
.deps
38+
*.m4
39+
*.log
5040
docs/genpages.sh
5141
sources/compile
5242
*.pyc

sources/ChangeLog

+126
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,131 @@
1+
2014-06-05 Amir Ghassemi Nasr <[email protected]>
2+
3+
* docs/jalali.html, sources/man/jctime.3, sources/pyjalali/datetime.py,
4+
sources/pyjalali/jalali.py: pyjalali and documentation update for
5+
jalali_update and jmktime integration
6+
7+
2014-04-25 Amir Ghassemi Nasr <[email protected]>
8+
9+
* sources/Makefile.am, sources/README, sources/configure.ac,
10+
sources/configure.in, sources/pyjalali/__init__.py: call setup.py from
11+
makefile. resolves #7
12+
13+
2014-04-12 Amir Ghassemi Nasr <[email protected]>
14+
15+
* sources/libjalali/jalali.c, sources/libjalali/jalali.h,
16+
sources/pyjalali/datetime.py, sources/pyjalali/helpers.py,
17+
sources/pyjalali/jalali.py: forward pyjalali date normalization to underlying
18+
C implementation
19+
20+
2014-04-11 Amir Ghassemi Nasr <[email protected]>
21+
22+
* sources/libjalali/jalali.c, test_kit/jalali_update.c: normalize date in
23+
jalali_update
24+
25+
2014-02-18 Amir Ghassemi Nasr <[email protected]>
26+
27+
* sources/libjalali/jtime.c, sources/pyjalali/jalali.py: reentrant library
28+
functions don't touch internal variables anymore
29+
30+
2014-02-24 Amir Ghassemi Nasr <[email protected]>
31+
32+
* .gitignore, docs/pyjalali/.buildinfo, docs/pyjalali/.doctrees/api.doctree,
33+
docs/pyjalali/.doctrees/environment.pickle,
34+
docs/pyjalali/.doctrees/index.doctree, docs/pyjalali/.doctrees/intro.doctree,
35+
docs/pyjalali/.doctrees/modules.doctree,
36+
docs/pyjalali/.doctrees/pyjalali.doctree, docs/pyjalali/_sources/index.txt,
37+
docs/pyjalali/_sources/intro.txt, docs/pyjalali/_sources/pyjalali.txt,
38+
docs/pyjalali/_static/ajax-loader.gif, docs/pyjalali/_static/basic.css,
39+
docs/pyjalali/_static/comment-bright.png,
40+
docs/pyjalali/_static/comment-close.png, docs/pyjalali/_static/comment.png,
41+
docs/pyjalali/_static/default.css, docs/pyjalali/_static/doctools.js,
42+
docs/pyjalali/_static/down-pressed.png, docs/pyjalali/_static/down.png,
43+
docs/pyjalali/_static/file.png, docs/pyjalali/_static/jquery.js,
44+
docs/pyjalali/_static/minus.png, docs/pyjalali/_static/plus.png,
45+
docs/pyjalali/_static/pygments.css, docs/pyjalali/_static/searchtools.js,
46+
docs/pyjalali/_static/sidebar.js, docs/pyjalali/_static/underscore.js,
47+
docs/pyjalali/_static/up-pressed.png, docs/pyjalali/_static/up.png,
48+
docs/pyjalali/_static/websupport.js, docs/pyjalali/genindex.html,
49+
docs/pyjalali/index.html, docs/pyjalali/intro.html,
50+
docs/pyjalali/objects.inv, docs/pyjalali/py-modindex.html,
51+
docs/pyjalali/pyjalali.html, docs/pyjalali/search.html,
52+
docs/pyjalali/searchindex.js, sources/pyjalali/__init__.py,
53+
sources/pyjalali/datetime.py, sources/pyjalali/docs/Makefile,
54+
sources/pyjalali/docs/conf.py, sources/pyjalali/docs/index.rst,
55+
sources/pyjalali/docs/intro.rst, sources/pyjalali/docs/pyjalali.rst,
56+
sources/pyjalali/helpers.py, sources/pyjalali/jalali.py,
57+
sources/pyjalali/jstr.py, sources/pyjalali/jtime.py,
58+
sources/pyjalali/types.py: some documentations for pyjalali added
59+
60+
2014-02-04 Ashkan Ghassemi <[email protected]>
61+
62+
* sources/libjalali/jalali.c, sources/src/jdate.c: fixes #8: incorrect
63+
string/format parsing when using -d on jdate due to undefined behaviour of
64+
strncpy() across different platforms. using sscanf() instead.
65+
66+
2013-12-01 Amir Ghassemi Nasr <[email protected]>
67+
68+
* sources/pyjalali/__init__.py, sources/pyjalali/datetime.py: date convertion
69+
added to datetime convertion functions
70+
71+
2013-11-27 Amir Ghassemi Nasr <[email protected]>
72+
73+
* sources/pyjalali/__init__.py, sources/pyjalali/datetime.py,
74+
sources/setup.py: datetime.strftime workaround
75+
76+
2013-11-25 Amir Ghassemi Nasr <[email protected]>
77+
78+
* sources/libjalali/jtime.c, sources/pyjalali/__init__.py,
79+
sources/pyjalali/datetime.py, sources/pyjalali/helpers.py: cleanup; revert
80+
jmktime changes due to jalali_update problems
81+
82+
* sources/pyjalali/__init__.py, sources/setup.py: added installer
83+
84+
* sources/pyjalali/__init__.py, sources/pyjalali/datetime.py,
85+
sources/pyjalali/helpers.py, sources/pyjalali/jalali.py: datetime.date
86+
implemented
87+
88+
2013-11-24 Amir Ghassemi Nasr <[email protected]>
89+
90+
* sources/pyjalali/datetime.py, sources/pyjalali/helpers.py,
91+
sources/pyjalali/jalali.py: datetime.datetime implemented.
92+
93+
* sources/pyjalali/__init__.py, sources/pyjalali/jalali.py,
94+
sources/pyjalali/jtime.py: jalali seperated from jtime
95+
96+
2013-11-21 Amir Ghassemi Nasr <[email protected]>
97+
98+
* sources/pyjalali/jstr.py, sources/pyjalali/jtime.py: make str functions
99+
std, jalali_get_date bugfix
100+
101+
2013-11-19 Amir Ghassemi Nasr <[email protected]>
102+
103+
* sources/pyjalali/jstr.py, sources/pyjalali/types.py: chages for datetime
104+
105+
* sources/libjalali/jtime.c, sources/libjalali/jtime.h: added normalization
106+
to jmktime
107+
108+
2013-11-17 Amir Ghassemi Nasr <[email protected]>
109+
110+
* .gitignore, sources/pyjalali/__init__.py, sources/pyjalali/jstr.py,
111+
sources/pyjalali/jtime.py, sources/pyjalali/types.py: python bindings added
112+
113+
2013-11-16 Ashkan Ghassemi <[email protected]>
114+
115+
* .gitignore, sources/libjalali/Makefile.am, sources/libjalali/jalali.c,
116+
sources/libjalali/jtime.c, sources/src/jcal.c, sources/src/jcal.h,
117+
sources/src/jdate.c: fixes an issue which caused an extra space to be printed
118+
after day number indicator when highlighted current day was friday. closes #1
119+
120+
2013-11-16 Ashkan Ghassemi <[email protected]>
121+
122+
* sources/src/jcal.c, sources/src/jcal.h, sources/src/jdate.c,
123+
sources/src/termcap.h: code sanitization. NOT COMPLETE.
124+
1125
2013-06-01 Ashkan Ghassemi <[email protected]>
2126

127+
* sources/ChangeLog, sources/gitlog2changelog.py: ChangeLog updated.
128+
3129
* sources/ChangeLog, sources/libjalali/jalali.c, sources/libjalali/jalali.h,
4130
sources/libjalali/jtime.c, sources/libjalali/jtime.h, sources/man/jcal.1,
5131
sources/src/jcal.c, sources/src/jcal.h, sources/src/jdate.c,

sources/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ACLOCAL_AMFLAGS = -I m4
2-
SUBDIRS = libjalali src man
2+
SUBDIRS = libjalali src man test_kit
33

44
if WANT_PYJALALI
55
install-exec-hook:

sources/autogen.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,17 @@ function clean() {
6868
"configure" "config.sub" "config.guess" "config.log"
6969
"config.status" "depcomp" "install-sh" "libtool" "ltmain.sh"
7070
"missing" "src/Makefile.in" "man/Makefile.in"
71+
"test_kit/jalali/Makefile.in" "test_kit/jalali/Makefile"
72+
"test_kit/Makefile.in" "test_kit/Makefile"
73+
"test_kit/jalali/.deps" "test_kit/jtime/.deps"
74+
"test_kit/jtime/Makefile.in" "test_kit/jalali/Makefile"
7175
"libjalali/Makefile.in" "INSTALL" )
7276

7377
echo -e "${GREEN}*${RESET} ${YELLOW}cleaning source tree...${RESET}"
7478

7579
# Makefile is present.
7680
if test -f Makefile; then
77-
echo -ne "${GREEN}*{RESET} {YELLOW}performing distclean on"
81+
echo -ne "${GREEN}* ${RESET}${YELLOW}performing distclean on"
7882
echo -ne " sources if possible...${RESET} "
7983
make distclean >/dev/null 2>&1
8084
let STAT=$?
@@ -215,8 +219,8 @@ which which 1>/dev/null 2>&1
215219
if [ $? -ne 0 ]; then
216220
echo -e "cannot find \`\`which''. autogen cannot continue."
217221
exit 1
218-
fi
219-
222+
fi
223+
220224
# Parsing command-line arguments
221225
GETOPT=`which getopt 2>/dev/null`
222226
if [ -z ${GETOPT} ]; then

sources/configure.ac

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ AC_CHECK_FUNCS([gettimeofday localtime_r memset strcasecmp strchr strstr tzset])
2929

3030
AC_CONFIG_FILES([Makefile
3131
libjalali/Makefile
32+
test_kit/Makefile
33+
test_kit/jalali/Makefile
34+
test_kit/jtime/Makefile
3235
man/Makefile
3336
src/Makefile
3437
])
3538

3639
PYTHON_COMPAT=( python2.7 python2.6 )
3740

38-
AC_ARG_ENABLE([pyjalali],
41+
AC_ARG_ENABLE([pyjalali],
3942
AC_HELP_STRING([--enbale-pyjalali], [Install Python bindings (pyjalali)]),
4043
[case $enableval in
4144
yes|no) installpyjalali=$enableval ;;

sources/test_kit/Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SUBDIRS = jalali jtime
2+

sources/test_kit/jalali/Makefile.am

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
bin_PROGRAMS = elc get_date get_diff jalali_update jyinfo leap sec_converter
2+
3+
INCLUDES = -I../../libjalali
4+
5+
AM_CFLAGS = @CFLAGS@ -fno-inline -D_REENTRANT -Wall \
6+
-O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
7+
8+
elc_SOURCES = elc.c
9+
get_date_SOURCES = get_date.c
10+
get_diff_SOURCES = get_diff.c
11+
jalali_update_SOURCES = jalali_update.c
12+
jyinfo_SOURCES = jyinfo.c
13+
leap_SOURCES = leap.c
14+
sec_converter_SOURCES = sec_converter.c
15+
16+
LDADD = ../../libjalali/libjalali.la
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

sources/test_kit/jtime/Makefile.am

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
bin_PROGRAMS = jasctime jctime jgmtime jstrftime jstrptime jlocaltime jmktime
2+
3+
INCLUDES = -I../../libjalali
4+
5+
AM_CFLAGS = @CFLAGS@ -fno-inline -D_REENTRANT -Wall \
6+
-O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
7+
8+
jasctime_SOURCES = jasctime.c
9+
jctime_SOURCES = jctime.c
10+
jgmtime_SOURCES = jgmtime.c
11+
jstrftime_SOURCES = jstrftime.c
12+
jstrptime_SOURCES = jstrptime.c
13+
jlocaltime_SOURCES = jlocaltime.c
14+
jmktime_SOURCES = jmktime.c
15+
16+
LDADD = ../../libjalali/libjalali.la -lreadline
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test_kit/compile_me.sh

-17
This file was deleted.

test_kit/jtime/compile_me.sh

-17
This file was deleted.

0 commit comments

Comments
 (0)