Skip to content

Commit

Permalink
Add simple uninstall target. Closes #753.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Dec 31, 2016
1 parent aff62a4 commit 0a14ad6
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 0 deletions.
6 changes: 6 additions & 0 deletions mesonbuild/backend/ninjabackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2141,6 +2141,12 @@ def generate_utils(self, outfile):
elem.add_item('COMMAND', cmd)
elem.add_item('pool', 'console')
elem.write(outfile)
cmd = [sys.executable, self.environment.get_build_command(),
'--internal', 'uninstall']
elem = NinjaBuildElement(self.all_outputs, 'uninstall', 'CUSTOM_COMMAND', 'PHONY')
elem.add_item('COMMAND', cmd)
elem.add_item('pool', 'console')
elem.write(outfile)

def generate_ending(self, outfile):
targetlist = []
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/coredata.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ def get_builtin_option_default(optname):
'test:': None,
'benchmark': None,
'install': None,
'uninstall': None,
'build.ninja': None,
'scan-build': None,
'reconfigure': None,
Expand Down
3 changes: 3 additions & 0 deletions mesonbuild/mesonmain.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ def run_script_command(args):
elif cmdname == 'yelphelper':
import mesonbuild.scripts.yelphelper as abc
cmdfunc = abc.run
elif cmdname == 'uninstall':
import mesonbuild.scripts.uninstall as abc
cmdfunc = abc.run
else:
raise MesonException('Unknown internal command {}.'.format(cmdname))
return cmdfunc(cmdargs)
Expand Down
46 changes: 46 additions & 0 deletions mesonbuild/scripts/uninstall.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Copyright 2016 The Meson development team

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os

logfile = 'meson-logs/install-log.txt'

def do_uninstall(log):
failures = 0
successes = 0
for line in open(log):
if line.startswith('#'):
continue
fname = line.strip()
try:
os.unlink(fname)
print('Deleted:', fname)
successes += 1
except Exception as e:
print('Could not delete %s: %s.' % (fname, e))
failures += 1
print('\nUninstall finished.\n')
print('Deleted:', successes)
print('Failed:', failures)
print('\nRemember that files created by custom scripts have not been removed.')

def run(args):
if len(args) != 0:
print('Weird error.')
return 1
if not os.path.exists(logfile):
print('Log file does not exist, no installation has been done.')
return 0
do_uninstall(logfile)
return 0
13 changes: 13 additions & 0 deletions run_unittests.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ def install(self):
os.environ['DESTDIR'] = self.installdir
self._run(self.ninja_command + ['install'])

def uninstall(self):
self._run(self.ninja_command + ['uninstall'])

def run_target(self, target):
self.output += subprocess.check_output(self.ninja_command + [target])

Expand Down Expand Up @@ -361,6 +364,16 @@ def test_compiler_check_flags_order(self):
Oargs = [arg for arg in cmd if arg.startswith('-O')]
self.assertEqual(Oargs, [Oflag, '-O0'])

def test_uninstall(self):
exename = os.path.join(self.installdir, 'usr/bin/prog')
testdir = os.path.join(self.common_test_dir, '8 install')
self.init(testdir)
self.assertFalse(os.path.exists(exename))
self.install()
self.assertTrue(os.path.exists(exename))
self.uninstall()
self.assertFalse(os.path.exists(exename))

class RewriterTests(unittest.TestCase):

def setUp(self):
Expand Down

0 comments on commit 0a14ad6

Please sign in to comment.