Skip to content

Commit

Permalink
Replace hg with git.
Browse files Browse the repository at this point in the history
Signed-off-by: Steffen Pankratz <[email protected]>
  • Loading branch information
kratz00 committed Jun 26, 2023
1 parent 750ad58 commit db28b9d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cmake-build
3 changes: 0 additions & 3 deletions .hgignore

This file was deleted.

8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ ELSE(NOT BEOS)
ENDIF(NOT BEOS)

EXECUTE_PROCESS(
COMMAND hg tip --template hg-{rev}:{node|short}
COMMAND git describe --always --dirty
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
RESULT_VARIABLE HGVERSION_RC
RESULT_VARIABLE GITVERSION_RC
OUTPUT_VARIABLE MOJOSETUP_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)

IF(HGVERSION_RC)
IF(GITVERSION_RC)
SET(MOJOSETUP_VERSION "???")
ENDIF(HGVERSION_RC)
ENDIF(GITVERSION_RC)

# !!! FIXME: ditch this when Gary's curses patches go into a formal CMake
# !!! FIXME: release, and just bump the minimum required version to it.
Expand Down
12 changes: 6 additions & 6 deletions docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Using MojoSetup.
If there are gaps in this documentation, please ask on the MojoSetup mailing
list. To subscribe to the list, go here...

http://icculus.org/mailman/listinfo/mojosetup
https://icculus.org/mailman/listinfo/mojosetup

...and then questions can go to [email protected]. This document will
be updated as we see what parts are confusing, so feedback is appreciated.
Expand All @@ -24,13 +24,13 @@ Each step has a lot of details, but all installers basically follow those same
Compile the software:

You will need some tools. First, you'll need your platform's favorite build
tools. You'll also need CMake (http://www.cmake.org/), and a Mercurial
(http://www.selenic.com/mercurial/) client. These are all available for most
tools. You'll also need CMake (https://www.cmake.org/), and a Git
(https://git-scm.com/) client. These are all available for most
popular operating systems, and some not-so-popular ones.

Get the latest version of MojoSetup from Mercurial:
Get the latest version of MojoSetup from Git:

hg clone http://hg.icculus.org/icculus/mojosetup
git clone https://github.com/icculus/mojosetup.git


Then you'll need to point CMake at it:
Expand Down Expand Up @@ -114,7 +114,7 @@ This is the complicated part, and where most of your effort will be spent.
of things we haven't even considered yet.

Configuration files are Lua scripts. The Lua language and runtime library is
documented at http://www.lua.org/, and they sell an excellent book called
documented at https://www.lua.org/, and they sell an excellent book called
"Programming in Lua" which is a fast read and will demonstrate all manners
of wild and interesting features of the language. That being said, most
people rolling config files don't need any significant Lua expertise, and
Expand Down
10 changes: 5 additions & 5 deletions misc/localization2pot.pl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
my $now = `date '+%Y-%m-%d %H:%M:%S%z'`;
chomp($now);

my $hgver = `hg tip --template 'hg-{rev}:{node|short}' 2>/dev/null`;
$hgver = '???' if ($hgver eq '');
my $gitver = `git describe --always --dirty 2>/dev/null`;
$gitver = '???' if ($gitver eq '');

my $exportdate = '';
my $generator = '';
Expand All @@ -33,11 +33,11 @@

print <<__EOF__;
# MojoSetup; a portable, flexible installation application.
# http://icculus.org/mojosetup/
# https://icculus.org/mojosetup/
#
# Please see the file LICENSE.txt in the source's root directory.
#
# This file generated by localization2pot.pl, version $hgver ...
# This file generated by localization2pot.pl, version $gitver ...
#
#
# NOTE: If you care about Unicode or ASCII chars above 127, this file _MUST_
Expand All @@ -64,7 +64,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mojosetup $hgver\\n"
"Project-Id-Version: mojosetup $gitver\\n"
"Report-Msgid-Bugs-To: icculus\@icculus.org\\n"
"POT-Creation-Date: $now\\n"
"PO-Revision-Date: $now\\n"
Expand Down
8 changes: 4 additions & 4 deletions misc/po2localization.pl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
my $now = `date '+%Y-%m-%d %H:%M:%S%z'`;
chomp($now);

my $hgver = `hg tip --template 'hg-{rev}:{node|short}' 2>/dev/null`;
$hgver = '???' if ($hgver eq '');
my $gitver = `git describe --always --dirty 2>/dev/null`;
$gitver = '???' if ($gitver eq '');

my %languages;
my %comments;
Expand Down Expand Up @@ -154,7 +154,7 @@
{
print <<__EOF__;
-- DO NOT EDIT BY HAND.
-- This file was generated with po2localization.pl, version $hgver ...
-- This file was generated with po2localization.pl, version $gitver ...
-- on $now
__EOF__
Expand All @@ -167,7 +167,7 @@
-- Please see the file LICENSE.txt in the source's root directory.
--
-- DO NOT EDIT BY HAND.
-- This file was generated with po2localization.pl, version $hgver ...
-- This file was generated with po2localization.pl, version $gitver ...
-- on $now
--
-- Your own installer's localizations go into app_localization.lua instead.
Expand Down

0 comments on commit db28b9d

Please sign in to comment.