Skip to content

Commit ba2b155

Browse files
committed
- updated cmake and source release script to package up some missing source files and added a new CMAKE optional parameter so people can compile the source release without SVN rev stamp because it is not an svn repo. Run cmake like this:
cmake -DWANT_SVN_STAMP=OFF ../
1 parent b810bb2 commit ba2b155

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,16 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
5656
SET(CMAKE_CXX_FLAGS_MINSIZEREL "-O3 ${CMAKE_CXX_FLAGS_MINSIZEREL} -O3 ")
5757
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -s") ## Strip binary
5858

59-
# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
60-
# the FindSubversion.cmake module is part of the standard distribution
61-
include(FindSubversion)
62-
# extract working copy information for SOURCE_DIR into MY_XXX variables
63-
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
64-
#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
59+
OPTION(WANT_SVN_STAMP "use svn stamp" ON)
60+
IF(WANT_SVN_STAMP)
61+
# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
62+
# the FindSubversion.cmake module is part of the standard distribution
63+
include(FindSubversion)
64+
# extract working copy information for SOURCE_DIR into MY_XXX variables
65+
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
66+
#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
67+
ENDIF()
68+
6569
SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"${MG_WC_REVISION}\\\"'")
6670

6771
IF(UNIX AND NOT APPLE)

mk/linux/makerelease.sh

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,34 @@ echo "Creating source package in $RELEASEDIR"
88

99
rm -rf $RELEASEDIR
1010
mkdir -p $RELEASEDIR
11+
mkdir -p $RELEASEDIR/source
1112
# copy sources
1213
pushd "`pwd`/../../source"
13-
find glest_game/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
14-
find shared_lib/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
15-
find glest_map_editor/ \( -name "*.cpp" -o -name "*.h" -o -name "*.xpm" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
16-
find g3d_viewer/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
17-
find configurator/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
18-
find masterserver/ \( -name "*.php" -o -name "*.sql" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
19-
find tools/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "*.pl" -o -name "*.sh" -o -name "*.css" -o -name "*.html" -o -name "*.ini" -o -name "*.ico" -o -name "*.txt" -o -name "*.dtd" -o -name "*.png" -o -name "*.py" -o -name "README" -o -name "INSTALL" -o -name "COPYING" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
14+
find glest_game/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
15+
find shared_lib/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
16+
find glest_map_editor/ \( -name "*.cpp" -o -name "*.h" -o -name "*.xpm" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
17+
find g3d_viewer/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
18+
find configurator/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
19+
find masterserver/ \( -name "*.php" -o -name "*.sql" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
20+
find tools/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "*.pl" -o -name "*.sh" -o -name "*.css" -o -name "*.html" -o -name "*.ini" -o -name "*.ico" -o -name "*.txt" -o -name "*.dtd" -o -name "*.png" -o -name "*.py" -o -name "README" -o -name "INSTALL" -o -name "COPYING" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
21+
22+
pushd "../"
23+
find mk/cmake/ \( -name "*.cmake" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
24+
find mk/macosx/ \( -name "*.txt" -o -name "*.plist" -o -name "*.icns" -o -name "PkgInfo" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
25+
popd
26+
2027
popd
21-
#AUTOCONFSTUFF="configure.ac autogen.sh Jamrules Jamfile `find mk/jam -name "*.jam"` `find mk/autoconf -name "*.m4" -o -name "config.*" -o -name "*sh"`"
2228

23-
#cp -p --parents $AUTOCONFSTUFF $RELEASEDIR
2429
cp -p ../../docs/readme*.txt ../../docs/*license*.txt $RELEASEDIR
2530
cp -p glest.ini $RELEASEDIR
2631
cp -p glestkeys.ini $RELEASEDIR
2732
cp -p servers.ini $RELEASEDIR
2833
cp -p glest.ico $RELEASEDIR
34+
cp -p glest.ico $RELEASEDIR
35+
cp -p ../../CMake* $RELEASEDIR
2936

3037
pushd $RELEASEDIR
31-
./autogen.sh
38+
#./autogen.sh
3239
popd
3340

3441
pushd release

0 commit comments

Comments
 (0)