Upgrade to new build system, bump version.
This commit is contained in:
parent
f602c362f2
commit
f6725f771d
6
make.sh
6
make.sh
|
@ -64,6 +64,7 @@ OUTPUT_DIRS="obj html"
|
||||||
# none no special processing happens before each file
|
# none no special processing happens before each file
|
||||||
# C #line directives are inserted before each file
|
# C #line directives are inserted before each file
|
||||||
# and VERSION, VERMAJOR etc. are #defined
|
# and VERSION, VERMAJOR etc. are #defined
|
||||||
|
# Ch Like C, but for header files (no VERSION #defines)
|
||||||
#
|
#
|
||||||
make_monolithic() {
|
make_monolithic() {
|
||||||
if [ $# -ne 2 ]
|
if [ $# -ne 2 ]
|
||||||
|
@ -82,6 +83,9 @@ make_monolithic() {
|
||||||
then
|
then
|
||||||
HASHLINE=1
|
HASHLINE=1
|
||||||
VERDEFINE=1
|
VERDEFINE=1
|
||||||
|
elif [ "$2" == "Ch" ]
|
||||||
|
then
|
||||||
|
HASHLINE=1
|
||||||
elif [ "$2" == "none" ]
|
elif [ "$2" == "none" ]
|
||||||
then
|
then
|
||||||
HASHLINE=0 # dummy command
|
HASHLINE=0 # dummy command
|
||||||
|
@ -261,7 +265,7 @@ else
|
||||||
targets="$@"
|
targets="$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for func in "${targets}"
|
for func in ${targets}
|
||||||
do
|
do
|
||||||
case ${func} in
|
case ${func} in
|
||||||
clean)
|
clean)
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
build.c++.app
|
build.c++.app
|
||||||
build.c++.lib
|
build.c++.lib
|
||||||
|
build.c++.qtapp
|
||||||
build.c++.tests
|
build.c++.tests
|
||||||
build.c.app
|
build.c.app
|
||||||
build.c.lib
|
build.c.lib
|
||||||
|
|
|
@ -31,7 +31,7 @@ then
|
||||||
echo " Compiling"
|
echo " Compiling"
|
||||||
|
|
||||||
SONAME="${libutf8_BASE}.so.${SOMAJOR}.${SOMINOR}"
|
SONAME="${libutf8_BASE}.so.${SOMAJOR}.${SOMINOR}"
|
||||||
do_cmd ${CC} ${CFLAGS} -shared -fpic -o "${libutf8}" \
|
do_cmd ${CC} ${CFLAGS} -Iobj -shared -fpic -o "${libutf8}" \
|
||||||
-Wl,-soname,${SONAME} \
|
-Wl,-soname,${SONAME} \
|
||||||
${SRC} ${SO_EXTRA} || return 1
|
${SRC} ${SO_EXTRA} || return 1
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libutf8/build.lib src/libutf8/build.monolithic"
|
||||||
if [ -z "${libutf8_MONOLITHIC}" ]
|
if [ -z "${libutf8_MONOLITHIC}" ]
|
||||||
then
|
then
|
||||||
MONOLITHIC_SOURCE="$(echo src/libutf8/{TopHeader,ForwardDeclare,ctype,{de,en}code{,_state},BottomHeader}.h)"
|
MONOLITHIC_SOURCE="$(echo src/libutf8/{TopHeader,ForwardDeclare,ctype,{de,en}code{,_state},BottomHeader}.h)"
|
||||||
make_monolithic ${HDR} C || return 1
|
make_monolithic ${HDR} Ch || return 1
|
||||||
|
|
||||||
MONOLITHIC_SOURCE="$(echo src/libutf8/{TopSource,ctype,{de,en}code{,_state}}.c)"
|
MONOLITHIC_SOURCE="$(echo src/libutf8/{TopSource,ctype,{de,en}code{,_state}}.c)"
|
||||||
make_monolithic ${SRC} C || return 1
|
make_monolithic ${SRC} C || return 1
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Name, description
|
# Name, description
|
||||||
Name: libutf8
|
Name: @TODO@
|
||||||
Description: Library for encoding and decoding UTF-8
|
Description: @TODO@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
# Requirements
|
# Requirements
|
||||||
|
|
|
@ -14,4 +14,4 @@ SOMAJOR=0
|
||||||
SOMINOR=0
|
SOMINOR=0
|
||||||
|
|
||||||
# SOMICRO is bumped every time there is a binary-compatible release.
|
# SOMICRO is bumped every time there is a binary-compatible release.
|
||||||
SOMICRO=0
|
SOMICRO=1
|
||||||
|
|
|
@ -8,11 +8,14 @@
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char* argv[])
|
int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
if(argc == 2 && !strcmp(argv[1], "--print-summary")) {
|
if(argc == 2 && !strcmp(argv[1], "--print-summary")) {
|
||||||
printf("One line summary.\n");
|
printf("One line summary.\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -22,8 +25,6 @@ int main(int argc, char* argv[])
|
||||||
// empty argument list
|
// empty argument list
|
||||||
}
|
}
|
||||||
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
2
version
2
version
|
@ -12,7 +12,7 @@
|
||||||
# suffixed with a string.
|
# suffixed with a string.
|
||||||
VERMAJOR=1
|
VERMAJOR=1
|
||||||
VERMINOR=2
|
VERMINOR=2
|
||||||
VERMICRO=0
|
VERMICRO=1
|
||||||
VEREXTRA=""
|
VEREXTRA=""
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||||
|
|
Loading…
Reference in New Issue